Author: jcouteau Date: 2010-11-06 15:12:36 +0100 (Sat, 06 Nov 2010) New Revision: 20 Url: http://chorem.org/repositories/revision/incubator/20 Log: Commit tries on wikitty use Added: refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/refcomp.css refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/public/ refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/public/RefComp.html Removed: refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/client/ refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/public/ refComp/skills-services/skills-services.iml Modified: refComp/pom.xml refComp/skills-client/pom.xml refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/RefComp.gwt.xml refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/AdminUsers.java refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Login.java refComp/skills-client/src/main/webapp/WEB-INF/web.xml Modified: refComp/pom.xml =================================================================== --- refComp/pom.xml 2010-11-06 14:07:51 UTC (rev 19) +++ refComp/pom.xml 2010-11-06 14:12:36 UTC (rev 20) @@ -66,7 +66,7 @@ <projectId>skills</projectId> <!-- libraries version --> - <gwtVersion>2.0.3</gwtVersion> + <gwtVersion>2.1.0</gwtVersion> <wikittyVersion>3.0-SNAPSHOT</wikittyVersion> <generatorPluginVersion>2.2</generatorPluginVersion> </properties> @@ -129,6 +129,39 @@ <version>8.4-701.jdbc4</version> <scope>runtime</scope> </dependency> + + <dependency> + <groupId>com.google.code.gwtx</groupId> + <artifactId>gwtx</artifactId> + <version>1.5.3</version> + </dependency> + + <!-- Comment, not maven packaged --> + <!--dependency> + <groupId>com.spiral</groupId> + <artifactId>gwt-calendar</artifactId> + <version>1.0-beta1</version> + </dependency--> + + <!-- JC Tried this, useless --> + <!--dependency> + <groupId>com.smartgwt</groupId> + <artifactId>smartgwt</artifactId> + <version>2.2</version> + </dependency> + + <dependency> + <groupId>org.gwtwidget</groupId> + <artifactId>gwt-widget</artifactId> + <version>1.1</version> + <type>war</type> + </dependency> + + <dependency> + <groupId>pl.rmalinowski</groupId> + <artifactId>gwtreflect</artifactId> + <version>0.8</version> + </dependency--> </dependencies> @@ -141,7 +174,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> - <version>1.2</version> + <version>2.1.0</version> <executions> <execution> <goals> @@ -154,7 +187,6 @@ <hostedWebapp>src/main/webapp</hostedWebapp> <runTarget>org.chorem.bonzoms.skills.client.RefComp/RefComp.html</runTarget> <noServer>false</noServer> - <gwtVersion>${gwtVersion}</gwtVersion> </configuration> </plugin> @@ -170,7 +202,7 @@ <directory>src/main/webapp/WEB-INF/classes</directory> </fileset> <fileset> - <directory>src/main/webapp/org.chorem.bonzoms.skills.client.RefComp</directory> + <directory>src/main/webapp/org.chorem.bonzoms.skills.RefComp</directory> </fileset> </filesets> </configuration> Modified: refComp/skills-client/pom.xml =================================================================== --- refComp/skills-client/pom.xml 2010-11-06 14:07:51 UTC (rev 19) +++ refComp/skills-client/pom.xml 2010-11-06 14:12:36 UTC (rev 20) @@ -51,6 +51,34 @@ <classifier>sources</classifier> </dependency> + <dependency> + <groupId>com.google.code.gwtx</groupId> + <artifactId>gwtx</artifactId> + </dependency> + + <!-- Not maven packaged --> + <!--dependency> + <groupId>com.spiral</groupId> + <artifactId>gwt-calendar</artifactId> + </dependency--> + + <!-- Useless tries --> + <!--dependency> + <groupId>com.smartgwt</groupId> + <artifactId>smartgwt</artifactId> + </dependency> + + <dependency> + <groupId>org.gwtwidget</groupId> + <artifactId>gwt-widget</artifactId> + <type>war</type> + </dependency> + + <dependency> + <groupId>pl.rmalinowski</groupId> + <artifactId>gwtreflect</artifactId> + </dependency--> + </dependencies> <!-- ************************************************************* --> Modified: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/RefComp.gwt.xml =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/RefComp.gwt.xml 2010-11-06 14:07:51 UTC (rev 19) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/RefComp.gwt.xml 2010-11-06 14:12:36 UTC (rev 20) @@ -6,8 +6,18 @@ <inherits name='com.google.gwt.user.User'/> <inherits name="com.google.gwt.uibinder.UiBinder"/> <inherits name="org.chorem.bonzoms.skills.Entities"/> + + <!--Wikitty dependency--> <inherits name="org.nuiton.WikittyAPI"/> + <!--gwtx dependency--> + <inherits name="com.googlecode.gwtx.Java"/> + + <!--gwt-calendar dependancy--> + <inherits name='com.spiral.gwt-calendar'/> + + <!--inherits name="com.smartgwt.SmartGwt"/--> + <!-- inherit css based theme --> <inherits name='com.google.gwt.user.theme.standard.Standard'/> Modified: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/AdminUsers.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/AdminUsers.java 2010-11-06 14:07:51 UTC (rev 19) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/AdminUsers.java 2010-11-06 14:12:36 UTC (rev 20) @@ -12,6 +12,7 @@ import org.chorem.bonzoms.skills.client.services.UserService; import org.chorem.bonzoms.skills.client.services.UserServiceAsync; import org.chorem.bonzoms.skills.entities.User; +import org.chorem.bonzoms.skills.entities.UserImpl; /** * User: couteau @@ -19,10 +20,10 @@ */ public class AdminUsers extends Composite { - private final UserServiceAsync userService = GWT - .create(UserService.class); + /**private final UserServiceAsync userService = GWT + .create(UserService.class);**/ - @UiTemplate("Login.ui.xml") + @UiTemplate("AdminUsers.ui.xml") interface MyUiBinder extends UiBinder<Panel, AdminUsers> { } @@ -34,7 +35,12 @@ public AdminUsers() { initWidget(binder.createAndBindUi(this)); - userService.getUser(new AsyncCallback<User>() { + User toto = new UserImpl(); + toto.setNom("Toto"); + + //userName.setText(toto.getNom()); + + /*userService.getUser(new AsyncCallback<User>() { @Override public void onFailure(Throwable caught) { Window.alert("Server communication error"); @@ -44,6 +50,6 @@ public void onSuccess(User result) { userName.setText(result.getNom()); } - }); + });*/ } } Modified: refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Login.java =================================================================== --- refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Login.java 2010-11-06 14:07:51 UTC (rev 19) +++ refComp/skills-client/src/main/java/org/chorem/bonzoms/skills/client/Login.java 2010-11-06 14:12:36 UTC (rev 20) @@ -77,8 +77,11 @@ header.clear(); content.add(new Search()); - header.add(new Header()); + Header newHeader = new Header(); + + header.add(newHeader); + } else { Window.alert("Login failed, try with admin/admin"); } Added: refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/refcomp.css =================================================================== --- refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/refcomp.css (rev 0) +++ refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/client/refcomp.css 2010-11-06 14:12:36 UTC (rev 20) @@ -0,0 +1,36 @@ +.greyText { + font-family: "Lucida Grande", Arial, Sans-serif; + color: #778899; + font-size: 11px; + text-align: left; +} + +.loginButton { + border: 1px solid #3399DD; + color: #FFFFFF; + background: #3322DD; + font-size: 11px; + font-weight: bold; + margin: 0 5px 0 0; + padding: 4px 10px 5px; + text-shadow: 0 -1px 0 #3399DD; +} + +.box { + border: 1px solid #AACCEE; + display: block; + font-size: 12px; + margin: 0 0 5px; + padding: 3px; + width: 203px; +} + +.background { + background-color: #DDEEF6; + border: 1px none transparent; + color: #778899; + font-size: 11px; + margin-left: -8px; + margin-top: 5px; + padding: 6px; +} Added: refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/public/RefComp.html =================================================================== --- refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/public/RefComp.html (rev 0) +++ refComp/skills-client/src/main/resources/org/chorem/bonzoms/skills/public/RefComp.html 2010-11-06 14:12:36 UTC (rev 20) @@ -0,0 +1,30 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> + <meta http-equiv="content-type" content="text/html; charset=UTF-8"> + + <title>Bonzoms - Skills</title> + + <meta name='gwt:module' content='org.chorem.bonzoms.skills.RefComp'> + + <!-- --> + <!-- This script loads your compiled module. --> + <!-- If you add any GWT meta tags, they must --> + <!-- be added before this line. --> + <!-- --> + <script type="text/javascript" language="javascript" src="org.chorem.bonzoms.skills.RefComp.nocache.js"></script> +</head> +<body> + +<div id="header"></div> + +<div id="content"></div> + +<div id="footer"></div> + + + <!-- OPTIONAL: include this if you want history support --> + <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe> +</body> +</html> \ No newline at end of file Modified: refComp/skills-client/src/main/webapp/WEB-INF/web.xml =================================================================== --- refComp/skills-client/src/main/webapp/WEB-INF/web.xml 2010-11-06 14:07:51 UTC (rev 19) +++ refComp/skills-client/src/main/webapp/WEB-INF/web.xml 2010-11-06 14:12:36 UTC (rev 20) @@ -16,7 +16,7 @@ </servlet> <servlet-mapping> <servlet-name>LoginService</servlet-name> - <url-pattern>/org.chorem.bonzoms.skills.client.RefComp/login</url-pattern> + <url-pattern>/org.chorem.bonzoms.skills.RefComp/login</url-pattern> </servlet-mapping> <servlet> @@ -26,7 +26,7 @@ </servlet> <servlet-mapping> <servlet-name>SearchService</servlet-name> - <url-pattern>/org.chorem.bonzoms.skills.client.RefComp/search</url-pattern> + <url-pattern>/org.chorem.bonzoms.skills.RefComp/search</url-pattern> </servlet-mapping> </web-app> Deleted: refComp/skills-services/skills-services.iml =================================================================== --- refComp/skills-services/skills-services.iml 2010-11-06 14:07:51 UTC (rev 19) +++ refComp/skills-services/skills-services.iml 2010-11-06 14:12:36 UTC (rev 20) @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/.svn" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <excludeFolder url="file://$MODULE_DIR$/target/.svn" /> - <excludeFolder url="file://$MODULE_DIR$/target/classes" /> - <excludeFolder url="file://$MODULE_DIR$/target/extra" /> - <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" /> - <excludeFolder url="file://$MODULE_DIR$/target/services-0.1-SNAPSHOT" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.gwt:gwt-user:2.0.3" level="project" /> - </component> -</module> -