Skip to content

Commit

Permalink
5-20151221-1
Browse files Browse the repository at this point in the history
Upgrade to GWTP 1.5.1 - Objectify 5.1.9
  • Loading branch information
MBP 13 2015 authored and MBP 13 2015 committed Dec 21, 2015
1 parent 58b0dc4 commit b670498
Show file tree
Hide file tree
Showing 36 changed files with 123 additions and 53 deletions.
13 changes: 6 additions & 7 deletions SIS/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<classpathentry kind="lib" path="war/WEB-INF/lib/guice-assistedinject-3.0.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/guice-servlet-3.0.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/gwt-servlet.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/gwtp-all-1.4.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/httpclient-4.0.1.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/httpcore-4.0.1.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/javax.inject.jar"/>
Expand All @@ -46,13 +45,7 @@
<classpathentry kind="lib" path="war/WEB-INF/lib/joda-time-2.7.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/jsr107cache-1.1.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/maven-artifact-3.2.1.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/objectify-5.1.3.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/requestfactory-apt.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/requestfactory-client.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/requestfactory-server.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/twilio-java-sdk-3.4.6.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/validation-api-1.0.0.GA-sources.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/validation-api-1.0.0.GA.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/appengine-gcs-client-0.4.4.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/commons-fileupload-1.3.1.jar"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/appengine-api-labs.jar"/>
Expand All @@ -61,5 +54,11 @@
<classpathentry kind="lib" path="war/WEB-INF/lib/aopalliance.jar"/>
<classpathentry kind="con" path="com.google.gdt.eclipse.managedapis.MANAGED_API_CONTAINER/storage-v1r33lv1.18.0-rc"/>
<classpathentry kind="lib" path="war/WEB-INF/lib/gxt-theme-neptune.jar"/>
<classpathentry kind="lib" path="/Users/ngocthuannguyen13/01.DEV/01-IDE/01-Lib/gwtp-all-1.5.1.jar"/>
<classpathentry kind="lib" path="/Users/ngocthuannguyen13/01.DEV/01-IDE/01-Lib/objectify-5.1.9.jar"/>
<classpathentry kind="lib" path="/Users/ngocthuannguyen13/01.DEV/01-IDE/01-Lib/gwt-2.7.0/requestfactory-apt.jar"/>
<classpathentry kind="lib" path="/Users/ngocthuannguyen13/01.DEV/01-IDE/01-Lib/gwt-2.7.0/requestfactory-client.jar"/>
<classpathentry kind="lib" path="/Users/ngocthuannguyen13/01.DEV/01-IDE/01-Lib/gwt-2.7.0/requestfactory-server.jar"/>
<classpathentry kind="lib" path="/Users/ngocthuannguyen13/01.DEV/01-IDE/01-Lib/gwt-2.7.0/validation-api-1.0.0.GA.jar"/>
<classpathentry kind="output" path="war/WEB-INF/classes"/>
</classpath>
7 changes: 4 additions & 3 deletions SIS/.factorypath
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<factorypath>
<factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="false" runInBatchMode="false"/>
<factorypathentry kind="EXTJAR" id="/Users/ngocthuannguyen/Documents/gwt-2.6.1/requestfactory-apt.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="EXTJAR" id="/Users/ngocthuannguyen/Documents/gwt-2.6.1/requestfactory-client.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="EXTJAR" id="/Users/ngocthuannguyen/Documents/gwt-2.6.1/requestfactory-server.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="EXTJAR" id="/Users/ngocthuannguyen13/01.DEV/01-IDE/01-Lib/gwt-2.7.0/requestfactory-client.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="EXTJAR" id="/Users/ngocthuannguyen13/01.DEV/01-IDE/01-Lib/gwt-2.7.0/requestfactory-server.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="EXTJAR" id="/Users/ngocthuannguyen13/01.DEV/01-IDE/01-Lib/gwt-2.7.0/validation-api-1.0.0.GA.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="EXTJAR" id="/Users/ngocthuannguyen13/01.DEV/01-IDE/01-Lib/gwt-2.7.0/requestfactory-apt.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
2 changes: 1 addition & 1 deletion SIS/.settings/com.google.appengine.eclipse.core.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<<<<<<<=HEAD
>>>>>>>=cahier-de-texte
eclipse.preferences.version=1
filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.9.25.jar|appengine-api-labs.jar|appengine-endpoints-deps.jar|appengine-endpoints.jar|appengine-jsr107cache-1.9.25.jar|jsr107cache-1.1.jar
filesCopiedToWebInfLib=appengine-api-1.0-sdk-1.9.30.jar|appengine-api-labs.jar|appengine-endpoints-deps.jar|appengine-endpoints.jar|appengine-jsr107cache-1.9.30.jar|jsr107cache-1.1.jar
gaeDatanucleusEnabled=false
gaeDatanucleusVersion=v2
gaeDeployDialogSettings=
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
XDOCLETBUILDERACTIVE=true
XDOCLETHOME=
XDOCLETUSEGLOBAL=true
XDOCLETVERSION=1.2.1
eclipse.preferences.version=1
11 changes: 11 additions & 0 deletions SIS/.settings/org.eclipse.wst.xsl.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CHECK_CALL_TEMPLATES=2
CHECK_XPATHS=2
CIRCULAR_REF=2
DUPLICATE_PARAMETER=2
EMPTY_PARAM=1
MISSING_INCLUDE=2
MISSING_PARAM=1
NAME_ATTRIBUTE_EMPTY=2
NAME_ATTRIBUTE_MISSING=2
TEMPLATE_CONFLICT=2
eclipse.preferences.version=1
19 changes: 13 additions & 6 deletions SIS/src/com/lemania/sis/client/gin/ClientModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
import com.lemania.sis.client.presenter.EcoleAddPresenter;
import com.lemania.sis.client.presenter.ContactPresenter;
import com.lemania.sis.client.presenter.SettingsPresenter;
import com.lemania.sis.client.place.SISPlaceManager;
import com.lemania.sis.client.presenter.CoursAddPresenter;
import com.lemania.sis.client.presenter.CoursPresenter;
import com.lemania.sis.client.presenter.FrmClasseListPresenter;
Expand Down Expand Up @@ -100,12 +99,20 @@ protected void configure() {
install(new StudyLogManagementModule());
install(new StudyLogStudentModule());

// Singletons
install(new DefaultModule(SISPlaceManager.class));

// Set DefaultPlace to homepage
bindConstant().annotatedWith(DefaultPlace.class).to(
NameTokens.homepage);
// 20151221 - Upgrade to GWTP 1.5.1
// // Singletons
// install(new DefaultModule(SISPlaceManager.class));
// // Set DefaultPlace to homepage
// bindConstant().annotatedWith(DefaultPlace.class).to(
// NameTokens.homepage);

install(new DefaultModule.Builder()
.defaultPlace(NameTokens.homepage)
.errorPlace(NameTokens.homepage)
.unauthorizedPlace(NameTokens.homepage)
.build());


bindPresenter(MainPagePresenter.class, MainPagePresenter.MyView.class,
MainPageView.class, MainPagePresenter.MyProxy.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
import com.google.inject.Singleton;
import com.google.inject.servlet.ServletModule;
import com.googlecode.objectify.ObjectifyFilter;
import com.gwtplatform.dispatch.shared.ActionImpl;
import com.gwtplatform.dispatch.server.guice.DispatchServiceImpl;

public class DispatchServletModule extends ServletModule {

@Override
public void configureServlets() {
//
serve("/" + ActionImpl.DEFAULT_SERVICE_NAME)
.with(DispatchServiceImpl.class);

// 20151221 - Upgrade to GWTP 1.5.1
// serve("/" + ActionImpl.DEFAULT_SERVICE_NAME)
// .with(DispatchServiceImpl.class);


filter("/*").through(ObjectifyFilter.class);
Expand Down
2 changes: 1 addition & 1 deletion SIS/src/com/lemania/sis/server/guice/ServerModule.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.lemania.sis.server.guice;

import com.gwtplatform.dispatch.server.guice.HandlerModule;
import com.gwtplatform.dispatch.rpc.server.guice.HandlerModule;

public class ServerModule extends HandlerModule {

Expand Down
12 changes: 10 additions & 2 deletions SIS/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
<!-- Indices written at Mon, 28 Sep 2015 18:53:24 CEST -->
<!-- Indices written at Mon, 21 Dec 2015 16:06:20 CET -->

<datastore-indexes/>
<datastore-indexes>

<!-- Used 1 time in query history -->
<datastore-index kind="Bulletin" ancestor="false" source="auto">
<property name="isFinished" direction="asc"/>
<property name="classeName" direction="asc"/>
<property name="studentName" direction="asc"/>
</datastore-index>

</datastore-indexes>
Binary file modified SIS/war/WEB-INF/appengine-generated/local_db.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion SIS/war/WEB-INF/appengine-web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<application>lemania-eprofil</application>

<version>5-20151005-1</version>
<version>5-20151221-1</version>


<threadsafe>true</threadsafe>
Expand Down
1 change: 0 additions & 1 deletion SIS/war/WEB-INF/classes/.gitignore

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified SIS/war/WEB-INF/lib/appengine-api-labs.jar
Binary file not shown.
Binary file modified SIS/war/WEB-INF/lib/appengine-endpoints-deps.jar
Binary file not shown.
Binary file modified SIS/war/WEB-INF/lib/appengine-endpoints.jar
Binary file not shown.
Binary file removed SIS/war/WEB-INF/lib/appengine-jsr107cache-1.9.25.jar
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit b670498

Please sign in to comment.