From michi at wyona.com Tue Sep 1 09:17:56 2009 From: michi at wyona.com (michi@wyona.com) Date: Tue Sep 1 09:49:34 2009 Subject: [Yanel-commits] rev 44516 - in public/yanel/trunk/src/webapp/htdocs: Google-Analytics commons Message-ID: <200909010717.n817HuR2028927@cvs-extra.wyona.com> Author: michi Date: 2009-09-01 09:17:56 +0200 (Tue, 01 Sep 2009) New Revision: 44516 Added: public/yanel/trunk/src/webapp/htdocs/commons/identity-transformation.xsl Removed: public/yanel/trunk/src/webapp/htdocs/commons/Id.xslt Modified: public/yanel/trunk/src/webapp/htdocs/Google-Analytics/page-GA.xslt Log: xslt renamed such that it is clear that the xslt it not about an identity (ID), but about the identity transformation Modified: public/yanel/trunk/src/webapp/htdocs/Google-Analytics/page-GA.xslt =================================================================== --- public/yanel/trunk/src/webapp/htdocs/Google-Analytics/page-GA.xslt 2009-08-31 21:26:22 UTC (rev 44515) +++ public/yanel/trunk/src/webapp/htdocs/Google-Analytics/page-GA.xslt 2009-09-01 07:17:56 UTC (rev 44516) @@ -4,7 +4,7 @@ > - + Deleted: public/yanel/trunk/src/webapp/htdocs/commons/Id.xslt =================================================================== --- public/yanel/trunk/src/webapp/htdocs/commons/Id.xslt 2009-08-31 21:26:22 UTC (rev 44515) +++ public/yanel/trunk/src/webapp/htdocs/commons/Id.xslt 2009-09-01 07:17:56 UTC (rev 44516) @@ -1,21 +0,0 @@ - - - - - - - - - - - - - Copied: public/yanel/trunk/src/webapp/htdocs/commons/identity-transformation.xsl (from rev 44515, public/yanel/trunk/src/webapp/htdocs/commons/Id.xslt) =================================================================== --- public/yanel/trunk/src/webapp/htdocs/commons/identity-transformation.xsl (rev 0) +++ public/yanel/trunk/src/webapp/htdocs/commons/identity-transformation.xsl 2009-09-01 07:17:56 UTC (rev 44516) @@ -0,0 +1,21 @@ + + + + + + + + + + + + + From michi at wyona.com Tue Sep 1 09:58:29 2009 From: michi at wyona.com (michi@wyona.com) Date: Tue Sep 1 10:30:07 2009 Subject: [Yanel-commits] rev 44519 - public/yanel/trunk/src/core/java/org/wyona/yanel/core Message-ID: <200909010758.n817wTRN029107@cvs-extra.wyona.com> Author: michi Date: 2009-09-01 09:58:29 +0200 (Tue, 01 Sep 2009) New Revision: 44519 Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/Environment.java Log: javadoc added and state of view check added Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/Environment.java =================================================================== --- public/yanel/trunk/src/core/java/org/wyona/yanel/core/Environment.java 2009-09-01 07:45:06 UTC (rev 44518) +++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/Environment.java 2009-09-01 07:58:29 UTC (rev 44519) @@ -18,13 +18,18 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import org.wyona.security.core.api.Identity; +import org.apache.log4j.Logger; + /** * The environment stores items which belong to the environment from which a resource * is called, i.e. the request, the response, the identity, the state of view, and the resource container path. */ public class Environment { + private static Logger log = Logger.getLogger(Environment.class); + private HttpServletRequest request; private HttpServletResponse response; private Identity identity; @@ -50,10 +55,6 @@ public HttpServletResponse getResponse() { return response; } - - public String getStateOfView() { - return sov; - } public String getResourceContainerPath() { return rcp; @@ -63,10 +64,23 @@ this.rcp = path; } + /** + * Set state of view + */ public void setStateOfView(String state) { + if (StateOfView.LIVE.equals(state) || StateOfView.AUTHORING.equals(state)) { + log.warn("No such state '" + state + "' explicitely supported by Yanel!"); + } this.sov = state; } + /** + * Get state of view (LIVE, AUTHORING) + */ + public String getStateOfView() { + return sov; + } + public void setIdentity(Identity identity) { this.identity = identity; } @@ -78,5 +92,4 @@ public void setResponse(HttpServletResponse response) { this.response = response; } - } From michi at wyona.com Tue Sep 1 10:07:43 2009 From: michi at wyona.com (michi@wyona.com) Date: Tue Sep 1 10:39:21 2009 Subject: [Yanel-commits] rev 44520 - public/yanel/trunk/src/core/java/org/wyona/yanel/core Message-ID: <200909010807.n8187hT0029167@cvs-extra.wyona.com> Author: michi Date: 2009-09-01 10:07:43 +0200 (Tue, 01 Sep 2009) New Revision: 44520 Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/Environment.java Log: if clause fixed Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/Environment.java =================================================================== --- public/yanel/trunk/src/core/java/org/wyona/yanel/core/Environment.java 2009-09-01 07:58:29 UTC (rev 44519) +++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/Environment.java 2009-09-01 08:07:43 UTC (rev 44520) @@ -37,11 +37,11 @@ private String rcp; public Environment(HttpServletRequest request, HttpServletResponse response, Identity identity, String stateOfView, String resourceContainerPath) { - this.request = request; - this.response = response; - this.identity = identity; - this.sov = stateOfView; - this.rcp = resourceContainerPath; + setRequest(request); + setResponse(response); + setIdentity(identity); + setStateOfView(stateOfView); + setResourceContainerPath(resourceContainerPath); } public Identity getIdentity() { @@ -68,8 +68,12 @@ * Set state of view */ public void setStateOfView(String state) { - if (StateOfView.LIVE.equals(state) || StateOfView.AUTHORING.equals(state)) { - log.warn("No such state '" + state + "' explicitely supported by Yanel!"); + if (log.isDebugEnabled()) { // Do not enable this, because the string comparison below is time consuming + if (!(StateOfView.LIVE.equals(state) || StateOfView.AUTHORING.equals(state))) { + log.warn("No such state '" + state + "' explicitely supported by Yanel!"); + } else { + log.debug("State of view: " + state); + } } this.sov = state; } From guillaume at wyona.com Tue Sep 1 11:40:54 2009 From: guillaume at wyona.com (guillaume@wyona.com) Date: Tue Sep 1 12:12:42 2009 Subject: [Yanel-commits] rev 44529 - public/yanel/trunk/src/build Message-ID: <200909010940.n819esmr029861@cvs-extra.wyona.com> Author: guillaume Date: 2009-09-01 11:40:54 +0200 (Tue, 01 Sep 2009) New Revision: 44529 Modified: public/yanel/trunk/src/build/dependencies.xml public/yanel/trunk/src/build/pom-core.xml Log: Now using new Wyona-commons version with new method "stringFromNodeList". Issue: 7226 Modified: public/yanel/trunk/src/build/dependencies.xml =================================================================== --- public/yanel/trunk/src/build/dependencies.xml 2009-09-01 09:38:06 UTC (rev 44528) +++ public/yanel/trunk/src/build/dependencies.xml 2009-09-01 09:40:54 UTC (rev 44529) @@ -39,7 +39,7 @@ - + Modified: public/yanel/trunk/src/build/pom-core.xml =================================================================== --- public/yanel/trunk/src/build/pom-core.xml 2009-09-01 09:38:06 UTC (rev 44528) +++ public/yanel/trunk/src/build/pom-core.xml 2009-09-01 09:40:54 UTC (rev 44529) @@ -40,7 +40,7 @@ wyona-org-commons wyona-org-commons - 1.0-dev-r41789 + 1.0-dev-r44520 log4j From hudson at wyona.com Tue Sep 1 11:42:52 2009 From: hudson at wyona.com (hudson@wyona.com) Date: Tue Sep 1 12:14:35 2009 Subject: [Yanel-commits] Build failed in Hudson: Yanel-trunk #388 Message-ID: <27121886.2281251798172491.JavaMail.guillaume@wc-13.wyona.com> See http://195.226.6.72:8080/job/Yanel-trunk/388/changes Changes: [Guillaume] Now using new Wyona-commons version with new method "stringFromNodeList". Issue: 7226 ------------------------------------------ A SCM change trigger started this job Updating https://svn.wyona.com/repos/public/yanel/trunk U src/build/pom-core.xml U src/build/dependencies.xml Fetching 'http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1' at 42,276 into 'http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant' At revision 42276 Fetching 'http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1_extras' at 42,238 into 'http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras' At revision 42238 Fetching 'http://svn.wyona.com/repos/public/0_tools/eclipse-3.settings' at -1 into 'http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/eclipse.settings' At revision 44529 At revision 44529 no change for http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1 since the previous build no change for http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1_extras since the previous build no change for http://svn.wyona.com/repos/public/0_tools/eclipse-3.settings since the previous build [workspace] $ /bin/sh -xe /tmp/hudson59353.sh + yanel-trunk.working-copy/src/build/targets/continuous-integration/CI 8180 8543 8105 8109 /opt/canoo/webtest-3.0-R_1758 + HTTP_PORT=8180 + HTTPS_PORT=8543 + SHUTDOWN_PORT=8105 + AJP_PORT=8109 + WEBTEST_HOME_DIR=/opt/canoo/webtest-3.0-R_1758 + TOMCAT_HOME=../../local/apache-tomcat-5.5.20 + dirname yanel-trunk.working-copy/src/build/targets/continuous-integration/CI + YANEL_SOURCE_HOME=yanel-trunk.working-copy/src/build/targets/continuous-integration/../../../.. + cd yanel-trunk.working-copy/src/build/targets/continuous-integration/../../../.. + ./build.sh clean-all -DanswerDeleteLocalBuildProperties=yes -DanswerDeleteLocalConfigDir=NO -DanswerCleanTomcatClusterNode1=yes Apache Ant version 1.7.1 compiled on June 27 2008 INFO: Building Yanel... Buildfile: src/build/build.xml init: [echo] INFO: Building with Apache Ant version 1.7.1 compiled on June 27 2008 and Java version 1.5 [echo] Yanel Home Dir: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/../../ probe-proxy: [echo] Check if proxy has been set ... proxy: dependencies: [artifact:dependencies] Downloading: wyona-org-commons/wyona-org-commons/1.0-dev-r44520/wyona-org-commons-1.0-dev-r44520.pom from wyona.remote.repository [artifact:dependencies] Downloading: wyona-org-commons/wyona-org-commons/1.0-dev-r44520/wyona-org-commons-1.0-dev-r44520.pom from central [artifact:dependencies] Downloading: wyona-org-commons/wyona-org-commons/1.0-dev-r44520/wyona-org-commons-1.0-dev-r44520.jar from wyona.remote.repository [artifact:dependencies] Downloading: wyona-org-commons/wyona-org-commons/1.0-dev-r44520/wyona-org-commons-1.0-dev-r44520.jar from central [artifact:dependencies] An error has occurred while processing the Maven artifact tasks. [artifact:dependencies] Diagnosis: [artifact:dependencies] [artifact:dependencies] Unable to resolve artifact: Missing: [artifact:dependencies] ---------- [artifact:dependencies] 1) wyona-org-commons:wyona-org-commons:jar:1.0-dev-r44520 [artifact:dependencies] [artifact:dependencies] Try downloading the file manually from the project website. [artifact:dependencies] [artifact:dependencies] Then, install it using the command: [artifact:dependencies] mvn install:install-file -DgroupId=wyona-org-commons -DartifactId=wyona-org-commons -Dversion=1.0-dev-r44520 -Dpackaging=jar -Dfile=/path/to/file [artifact:dependencies] [artifact:dependencies] Alternatively, if you host your own repository you can deploy the file there: [artifact:dependencies] mvn deploy:deploy-file -DgroupId=wyona-org-commons -DartifactId=wyona-org-commons -Dversion=1.0-dev-r44520 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] [artifact:dependencies] [artifact:dependencies] Path to dependency: [artifact:dependencies] 1) org.apache.maven:super-pom:jar:2.0 [artifact:dependencies] 2) wyona-org-commons:wyona-org-commons:jar:1.0-dev-r44520 [artifact:dependencies] [artifact:dependencies] ---------- [artifact:dependencies] 1 required artifact is missing. [artifact:dependencies] [artifact:dependencies] for artifact: [artifact:dependencies] org.apache.maven:super-pom:jar:2.0 [artifact:dependencies] [artifact:dependencies] from the specified remote repositories: [artifact:dependencies] central (http://repo1.maven.org/maven2), [artifact:dependencies] wyona.remote.repository (http://maven2.wyona.org/) [artifact:dependencies] BUILD FAILED http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/dependencies.xml :33: Unable to resolve artifact: Missing: ---------- 1) wyona-org-commons:wyona-org-commons:jar:1.0-dev-r44520 Try downloading the file manually from the project website. Then, install it using the command: mvn install:install-file -DgroupId=wyona-org-commons -DartifactId=wyona-org-commons -Dversion=1.0-dev-r44520 -Dpackaging=jar -Dfile=/path/to/file Alternatively, if you host your own repository you can deploy the file there: mvn deploy:deploy-file -DgroupId=wyona-org-commons -DartifactId=wyona-org-commons -Dversion=1.0-dev-r44520 -Dpackaging=jar -Dfile=/path/to/file -Durl=[url] -DrepositoryId=[id] Path to dependency: 1) org.apache.maven:super-pom:jar:2.0 2) wyona-org-commons:wyona-org-commons:jar:1.0-dev-r44520 ---------- 1 required artifact is missing. for artifact: org.apache.maven:super-pom:jar:2.0 from the specified remote repositories: central (http://repo1.maven.org/maven2), wyona.remote.repository (http://maven2.wyona.org/) Total time: 7 seconds Recording test results From guillaume at wyona.com Tue Sep 1 12:10:55 2009 From: guillaume at wyona.com (guillaume@wyona.com) Date: Tue Sep 1 12:42:34 2009 Subject: [Yanel-commits] rev 44533 - public/yanel/contributions/resources/creatable-modifiable-deletable-v3 Message-ID: <200909011010.n81AAtKI030040@cvs-extra.wyona.com> Author: guillaume Date: 2009-09-01 12:10:55 +0200 (Tue, 01 Sep 2009) New Revision: 44533 Modified: public/yanel/contributions/resources/creatable-modifiable-deletable-v3/build.xml Log: Now using Yanel's default build script which does the same and more, namely it supports building under Eclipse! Issue: 7226 Issue: 6967 Modified: public/yanel/contributions/resources/creatable-modifiable-deletable-v3/build.xml =================================================================== --- public/yanel/contributions/resources/creatable-modifiable-deletable-v3/build.xml 2009-09-01 09:48:31 UTC (rev 44532) +++ public/yanel/contributions/resources/creatable-modifiable-deletable-v3/build.xml 2009-09-01 10:10:55 UTC (rev 44533) @@ -1,100 +1,3 @@ - - - - - - - - - YANEL_HOME is set to: ${yanel.home} - - - - - - - - Initialize build - - - Resource Home Directory: ${resource.home.dir} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copy ehcache brand browser config - - - - - - - - - - - - - - - - - - - - - - - - @VERSION@ - - - @NAME@ - - - - - - - + + From guillaume at wyona.com Tue Sep 1 12:21:28 2009 From: guillaume at wyona.com (guillaume@wyona.com) Date: Tue Sep 1 12:53:07 2009 Subject: [Yanel-commits] rev 44535 - public/yanel/trunk/src/build Message-ID: <200909011021.n81ALSR3030143@cvs-extra.wyona.com> Author: guillaume Date: 2009-09-01 12:21:28 +0200 (Tue, 01 Sep 2009) New Revision: 44535 Modified: public/yanel/trunk/src/build/dependencies.xml public/yanel/trunk/src/build/pom-core.xml Log: Ooops, wrong version of Wyona-commons had been breaking the build since revision 44529... Issue: 7226 Modified: public/yanel/trunk/src/build/dependencies.xml =================================================================== --- public/yanel/trunk/src/build/dependencies.xml 2009-09-01 10:11:36 UTC (rev 44534) +++ public/yanel/trunk/src/build/dependencies.xml 2009-09-01 10:21:28 UTC (rev 44535) @@ -39,7 +39,7 @@ - + Modified: public/yanel/trunk/src/build/pom-core.xml =================================================================== --- public/yanel/trunk/src/build/pom-core.xml 2009-09-01 10:11:36 UTC (rev 44534) +++ public/yanel/trunk/src/build/pom-core.xml 2009-09-01 10:21:28 UTC (rev 44535) @@ -40,7 +40,7 @@ wyona-org-commons wyona-org-commons - 1.0-dev-r44520 + 1.0-dev-r44527 log4j From hudson at wyona.com Tue Sep 1 12:30:51 2009 From: hudson at wyona.com (hudson@wyona.com) Date: Tue Sep 1 13:02:33 2009 Subject: [Yanel-commits] Hudson build is back to normal: Yanel-trunk #389 In-Reply-To: <27121886.2281251798172491.JavaMail.guillaume@wc-13.wyona.com> References: <27121886.2281251798172491.JavaMail.guillaume@wc-13.wyona.com> Message-ID: <9224618.2381251801051179.JavaMail.guillaume@wc-13.wyona.com> See http://195.226.6.72:8080/job/Yanel-trunk/389/changes From guillaume at wyona.com Tue Sep 1 14:01:53 2009 From: guillaume at wyona.com (guillaume@wyona.com) Date: Tue Sep 1 14:33:32 2009 Subject: [Yanel-commits] rev 44536 - in public/yanel/trunk/src: build build/resource-types build/targets build/targets/webapp test Message-ID: <200909011201.n81C1rBI030286@cvs-extra.wyona.com> Author: guillaume Date: 2009-09-01 14:01:52 +0200 (Tue, 01 Sep 2009) New Revision: 44536 Modified: public/yanel/trunk/src/build/build.xml public/yanel/trunk/src/build/resource-types/resource-type.build.xml public/yanel/trunk/src/build/targets/build-artifacts.build.xml public/yanel/trunk/src/build/targets/build-binary-snapshot.xml public/yanel/trunk/src/build/targets/build-update-war.xml public/yanel/trunk/src/build/targets/realms.xml public/yanel/trunk/src/build/targets/resources.xml public/yanel/trunk/src/build/targets/webapp/webapp.xml public/yanel/trunk/src/test/build.xml Log: Small refactoring: in Yanel build system replaced "${yanel.version}-r${yanel.revision}" by "${yanel.source.version}" everywhere: that should ease refactorings to compute the revision number from the working copy at some later point! Issue: 5341 Modified: public/yanel/trunk/src/build/build.xml =================================================================== --- public/yanel/trunk/src/build/build.xml 2009-09-01 10:21:28 UTC (rev 44535) +++ public/yanel/trunk/src/build/build.xml 2009-09-01 12:01:52 UTC (rev 44536) @@ -177,7 +177,7 @@ - + @@ -233,7 +233,7 @@ - + Modified: public/yanel/trunk/src/build/resource-types/resource-type.build.xml =================================================================== --- public/yanel/trunk/src/build/resource-types/resource-type.build.xml 2009-09-01 10:21:28 UTC (rev 44535) +++ public/yanel/trunk/src/build/resource-types/resource-type.build.xml 2009-09-01 12:01:52 UTC (rev 44536) @@ -81,7 +81,7 @@ - + Modified: public/yanel/trunk/src/build/targets/build-artifacts.build.xml =================================================================== --- public/yanel/trunk/src/build/targets/build-artifacts.build.xml 2009-09-01 10:21:28 UTC (rev 44535) +++ public/yanel/trunk/src/build/targets/build-artifacts.build.xml 2009-09-01 12:01:52 UTC (rev 44536) @@ -12,7 +12,7 @@ - @@ -20,12 +20,12 @@ - + @VERSION@ - @@ -34,9 +34,9 @@ - + - + @@ -52,7 +52,7 @@ - @@ -60,12 +60,12 @@ - + @VERSION@ - @@ -74,9 +74,9 @@ - + - + Modified: public/yanel/trunk/src/build/targets/build-binary-snapshot.xml =================================================================== --- public/yanel/trunk/src/build/targets/build-binary-snapshot.xml 2009-09-01 10:21:28 UTC (rev 44535) +++ public/yanel/trunk/src/build/targets/build-binary-snapshot.xml 2009-09-01 12:01:52 UTC (rev 44536) @@ -12,7 +12,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -83,12 +83,12 @@ - - + + @SERVLET_CONTEXT@ - + @SERVLET_CONTEXT@ @@ -151,7 +151,7 @@ - + @SERVLET_CONTEXT@ @@ -174,7 +174,7 @@ - + @@ -192,19 +192,19 @@ - + @YANEL_VERSION@ - + @@ -219,7 +219,7 @@ - + Modified: public/yanel/trunk/src/build/targets/build-update-war.xml =================================================================== --- public/yanel/trunk/src/build/targets/build-update-war.xml 2009-09-01 10:21:28 UTC (rev 44535) +++ public/yanel/trunk/src/build/targets/build-update-war.xml 2009-09-01 12:01:52 UTC (rev 44536) @@ -4,7 +4,7 @@ - + @@ -48,7 +48,7 @@ ../src/realms/welcome-admin/yanel/resources - + @SERVLET_CONTEXT@ @@ -64,7 +64,7 @@ @INSTALLTYPE@ - + Modified: public/yanel/trunk/src/build/targets/realms.xml =================================================================== --- public/yanel/trunk/src/build/targets/realms.xml 2009-09-01 10:21:28 UTC (rev 44535) +++ public/yanel/trunk/src/build/targets/realms.xml 2009-09-01 12:01:52 UTC (rev 44536) @@ -40,7 +40,7 @@ --> - + @@ -57,7 +57,7 @@ --> - + Modified: public/yanel/trunk/src/build/targets/resources.xml =================================================================== --- public/yanel/trunk/src/build/targets/resources.xml 2009-09-01 10:21:28 UTC (rev 44535) +++ public/yanel/trunk/src/build/targets/resources.xml 2009-09-01 12:01:52 UTC (rev 44536) @@ -79,7 +79,7 @@ - + Modified: public/yanel/trunk/src/build/targets/webapp/webapp.xml =================================================================== --- public/yanel/trunk/src/build/targets/webapp/webapp.xml 2009-09-01 10:21:28 UTC (rev 44535) +++ public/yanel/trunk/src/build/targets/webapp/webapp.xml 2009-09-01 12:01:52 UTC (rev 44536) @@ -170,7 +170,7 @@ - + Modified: public/yanel/trunk/src/test/build.xml =================================================================== --- public/yanel/trunk/src/test/build.xml 2009-09-01 10:21:28 UTC (rev 44535) +++ public/yanel/trunk/src/test/build.xml 2009-09-01 12:01:52 UTC (rev 44536) @@ -24,9 +24,7 @@ - - From guillaume at wyona.com Tue Sep 1 14:14:02 2009 From: guillaume at wyona.com (guillaume@wyona.com) Date: Tue Sep 1 14:45:42 2009 Subject: [Yanel-commits] rev 44537 - public/yanel/contributions/resources/creatable-modifiable-deletable-v3/src/build Message-ID: <200909011214.n81CE2cE030413@cvs-extra.wyona.com> Author: guillaume Date: 2009-09-01 14:14:02 +0200 (Tue, 01 Sep 2009) New Revision: 44537 Removed: public/yanel/contributions/resources/creatable-modifiable-deletable-v3/src/build/cache-globus-brand-browser.xml Log: Obsolete, has been move into 'shared' RT of project. Deleted: public/yanel/contributions/resources/creatable-modifiable-deletable-v3/src/build/cache-globus-brand-browser.xml =================================================================== --- public/yanel/contributions/resources/creatable-modifiable-deletable-v3/src/build/cache-globus-brand-browser.xml 2009-09-01 12:01:52 UTC (rev 44536) +++ public/yanel/contributions/resources/creatable-modifiable-deletable-v3/src/build/cache-globus-brand-browser.xml 2009-09-01 12:14:02 UTC (rev 44537) @@ -1,410 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - From michi at wyona.com Tue Sep 1 14:39:25 2009 From: michi at wyona.com (michi@wyona.com) Date: Tue Sep 1 15:11:04 2009 Subject: [Yanel-commits] rev 44538 - public/yanel/trunk/src/build Message-ID: <200909011239.n81CdPAw030476@cvs-extra.wyona.com> Author: michi Date: 2009-09-01 14:39:25 +0200 (Tue, 01 Sep 2009) New Revision: 44538 Modified: public/yanel/trunk/src/build/build.properties Log: comment added Modified: public/yanel/trunk/src/build/build.properties =================================================================== --- public/yanel/trunk/src/build/build.properties 2009-09-01 12:14:02 UTC (rev 44537) +++ public/yanel/trunk/src/build/build.properties 2009-09-01 12:39:25 UTC (rev 44538) @@ -135,8 +135,9 @@ # WebTest home dir (needed if you want to execute WebTest-based tests, they will be skipped if this is left undefined) #webtest.home.dir=/opt/canoo-webtest-3.0-R_1758 +# Please note yanel.source.version is also used for binary releases and actually should rather be called yanel.version.revision instead, but for backwards compatibility reasons we cannot just replace it (third-party resource types and realms are using this property within their dependencies files)! +yanel.source.version=${yanel.version}-r${yanel.revision} -yanel.source.version=${yanel.version}-r${yanel.revision} yanel.conf.dir=${yanel.source.home}/conf yanel.build.webapp.classes.dir=${yanel.source.home}/build/webapps/${servlet.context.prefix}/WEB-INF/classes yanel.build.webapp.lib.dir=${yanel.source.home}/build/webapps/${servlet.context.prefix}/WEB-INF/lib From guillaume at wyona.com Wed Sep 2 09:49:44 2009 From: guillaume at wyona.com (guillaume@wyona.com) Date: Wed Sep 2 10:21:30 2009 Subject: [Yanel-commits] rev 44553 - public/yanel/contributions/resources/creatable-modifiable-deletable-v3 Message-ID: <200909020749.n827nisO000573@cvs-extra.wyona.com> Author: guillaume Date: 2009-09-02 09:49:43 +0200 (Wed, 02 Sep 2009) New Revision: 44553 Modified: public/yanel/contributions/resources/creatable-modifiable-deletable-v3/build.xml Log: Ooops, this RT belongs to Yanel, changing misleading name! Modified: public/yanel/contributions/resources/creatable-modifiable-deletable-v3/build.xml =================================================================== --- public/yanel/contributions/resources/creatable-modifiable-deletable-v3/build.xml 2009-09-02 07:20:09 UTC (rev 44552) +++ public/yanel/contributions/resources/creatable-modifiable-deletable-v3/build.xml 2009-09-02 07:49:43 UTC (rev 44553) @@ -1,3 +1,3 @@ - + From michi at wyona.com Wed Sep 2 15:33:30 2009 From: michi at wyona.com (michi@wyona.com) Date: Wed Sep 2 16:05:18 2009 Subject: [Yanel-commits] rev 44565 - public/yanel/trunk/src/build/resource-types Message-ID: <200909021333.n82DXUad001557@cvs-extra.wyona.com> Author: michi Date: 2009-09-02 15:33:30 +0200 (Wed, 02 Sep 2009) New Revision: 44565 Modified: public/yanel/trunk/src/build/resource-types/resource-type.build.xml Log: obsolete comment removed Modified: public/yanel/trunk/src/build/resource-types/resource-type.build.xml =================================================================== --- public/yanel/trunk/src/build/resource-types/resource-type.build.xml 2009-09-02 13:27:45 UTC (rev 44564) +++ public/yanel/trunk/src/build/resource-types/resource-type.build.xml 2009-09-02 13:33:30 UTC (rev 44565) @@ -174,7 +174,6 @@ - From michi at wyona.com Wed Sep 2 16:23:50 2009 From: michi at wyona.com (michi@wyona.com) Date: Wed Sep 2 16:56:00 2009 Subject: [Yanel-commits] rev 44569 - public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw Message-ID: <200909021423.n82ENoJh001779@cvs-extra.wyona.com> Author: michi Date: 2009-09-02 16:23:50 +0200 (Wed, 02 Sep 2009) New Revision: 44569 Modified: public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java Log: session expired code started to refactor Modified: public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java =================================================================== --- public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java 2009-09-02 14:11:21 UTC (rev 44568) +++ public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java 2009-09-02 14:23:50 UTC (rev 44569) @@ -160,13 +160,17 @@ * */ private User findRepoUser(String usrGuid, long duration_hour) throws Exception { + log.warn("DEBUG: Find user: " + usrGuid); User upUser = null; Map pwHM = getOblivionMap(getEnvironment().getRequest()); ResetPWExpire resetObj = pwHM.get(usrGuid); if (resetObj == null) { - Node [] children = null; - children = getRealm().getRepository().getNode("nodePath").getNodes(); + log.warn("DEBUG: Reset object is null!"); + + log.warn("TODO: Implementation not finished!"); +/* + Node[] children = getRealm().getRepository().getNode("nodePath").getNodes(); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilder db = null; db = dbf.newDocumentBuilder(); @@ -184,6 +188,7 @@ upUser = realm.getIdentityManager().getUserManager().getUser(userid); } } +*/ } else { boolean check = validGuid(resetObj.getDateTime(), duration_hour); if(check) { @@ -236,6 +241,9 @@ return action; } + /** + * + */ private Map getOblivionMap(HttpServletRequest request) throws Exception { javax.servlet.http.HttpSession session = request.getSession(true); Map pwHM = (Map) session.getAttribute("pwreset"); From guillaume at wyona.com Wed Sep 2 16:34:05 2009 From: guillaume at wyona.com (guillaume@wyona.com) Date: Wed Sep 2 17:05:53 2009 Subject: [Yanel-commits] rev 44570 - in public/yanel/trunk/src: contributions/resources/lookup contributions/resources/xinha resources/tinymce Message-ID: <200909021434.n82EY5MC001822@cvs-extra.wyona.com> Author: guillaume Date: 2009-09-02 16:34:04 +0200 (Wed, 02 Sep 2009) New Revision: 44570 Modified: public/yanel/trunk/src/contributions/resources/lookup/build.xml public/yanel/trunk/src/contributions/resources/xinha/build.xml public/yanel/trunk/src/resources/tinymce/build.xml Log: Now using Yanel's default build script which does the same and more, namely it supports building under Eclipse! Issue: 7089 Issue: 6967 Modified: public/yanel/trunk/src/contributions/resources/lookup/build.xml =================================================================== --- public/yanel/trunk/src/contributions/resources/lookup/build.xml 2009-09-02 14:23:50 UTC (rev 44569) +++ public/yanel/trunk/src/contributions/resources/lookup/build.xml 2009-09-02 14:34:04 UTC (rev 44570) @@ -1,56 +1,3 @@ - - - - - - - - - YANEL_HOME is set to: ${yanel.home} - - - - - - - Initialize build - - - Resource Home Directory: ${resource.home.dir} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Modified: public/yanel/trunk/src/contributions/resources/xinha/build.xml =================================================================== --- public/yanel/trunk/src/contributions/resources/xinha/build.xml 2009-09-02 14:23:50 UTC (rev 44569) +++ public/yanel/trunk/src/contributions/resources/xinha/build.xml 2009-09-02 14:34:04 UTC (rev 44570) @@ -1,79 +1,3 @@ - - - - - - - - - YANEL_HOME is set to: ${yanel.home} - - - - - - - - Initialize build - - - Resource Home Directory: ${resource.home.dir} - - - - - - - - - - - - - - - - - - - - - - - ${new.resource.java.classname.fs.path} - - ${resource.classes.dir}/${new.resource.java.class.fs.path} - - - - - - - - - - - - - - - - - - - + + Modified: public/yanel/trunk/src/resources/tinymce/build.xml =================================================================== --- public/yanel/trunk/src/resources/tinymce/build.xml 2009-09-02 14:23:50 UTC (rev 44569) +++ public/yanel/trunk/src/resources/tinymce/build.xml 2009-09-02 14:34:04 UTC (rev 44570) @@ -1,80 +1,3 @@ - - - - - - - - - YANEL_HOME is set to: ${yanel.home} - - - - - - - - Initialize build - - - Resource Home Directory: ${resource.home.dir} - - - - - - - - - - - - - - - - - - - - - - - - ${new.resource.java.classname.fs.path} - - hilfes${resource.classes.dir}/${new.resource.java.class.fs.path} - - - - - - - - - - - - - - - - - - - + + From michi at wyona.com Thu Sep 3 09:27:39 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 3 09:59:33 2009 Subject: [Yanel-commits] rev 44575 - public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw Message-ID: <200909030727.n837Rdsf003641@cvs-extra.wyona.com> Author: michi Date: 2009-09-03 09:27:38 +0200 (Thu, 03 Sep 2009) New Revision: 44575 Modified: public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ResetPWExpire.java Log: javadoc added and formatting Modified: public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ResetPWExpire.java =================================================================== --- public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ResetPWExpire.java 2009-09-02 21:03:50 UTC (rev 44574) +++ public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ResetPWExpire.java 2009-09-03 07:27:38 UTC (rev 44575) @@ -15,28 +15,39 @@ */ package org.wyona.yanel.impl.resources.forgotpw; - public class ResetPWExpire { - private String userId; - private long dateTime; - private String guid; - private String email; +/** + * Bean containing data of reset password request + */ +public class ResetPWExpire { - public ResetPWExpire(String userid, long datetime, String guid, String email) { - this.userId = userid; - this.dateTime = datetime; - this.guid = guid; - this.email = email; - } - public String getUserId() { - return userId; - } - public long getDateTime() { - return dateTime; - } - public String getGuid() { - return guid; - } - public String getEmail() { - return email; - } + private String userId; + private long dateTime; + private String guid; + private String email; + + /** + * + */ + public ResetPWExpire(String userid, long datetime, String guid, String email) { + this.userId = userid; + this.dateTime = datetime; + this.guid = guid; + this.email = email; } + + public String getUserId() { + return userId; + } + + public long getDateTime() { + return dateTime; + } + + public String getGuid() { + return guid; + } + + public String getEmail() { + return email; + } +} From michi at wyona.com Thu Sep 3 09:55:19 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 3 10:27:12 2009 Subject: [Yanel-commits] rev 44576 - public/yanel/trunk/src/webapp/xslt Message-ID: <200909030755.n837tJWU003703@cvs-extra.wyona.com> Author: michi Date: 2009-09-03 09:55:19 +0200 (Thu, 03 Sep 2009) New Revision: 44576 Modified: public/yanel/trunk/src/webapp/xslt/login-screen.xsl Log: title improved Modified: public/yanel/trunk/src/webapp/xslt/login-screen.xsl =================================================================== --- public/yanel/trunk/src/webapp/xslt/login-screen.xsl 2009-09-03 07:27:38 UTC (rev 44575) +++ public/yanel/trunk/src/webapp/xslt/login-screen.xsl 2009-09-03 07:55:19 UTC (rev 44576) @@ -17,7 +17,7 @@ - Login - Yanel + Login to realm "<xsl:value-of select="/yanel:yanel-auth-screen/yanel:realm/@yanel:name"/>" - Yanel From michi at wyona.com Thu Sep 3 13:52:48 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 3 14:24:43 2009 Subject: [Yanel-commits] rev 44581 - public/yanel/trunk/src/build Message-ID: <200909031152.n83BqmNY004160@cvs-extra.wyona.com> Author: michi Date: 2009-09-03 13:52:48 +0200 (Thu, 03 Sep 2009) New Revision: 44581 Modified: public/yanel/trunk/src/build/build.properties Log: xml-apis lib added to ambiguous libs Modified: public/yanel/trunk/src/build/build.properties =================================================================== --- public/yanel/trunk/src/build/build.properties 2009-09-03 11:02:54 UTC (rev 44580) +++ public/yanel/trunk/src/build/build.properties 2009-09-03 11:52:48 UTC (rev 44581) @@ -10,12 +10,13 @@ # # IMPORTANT: Because of the changes listed below, one might has to re-configure the local.build.properties file (and in particular synchronize the build.properties.version number # +# Change 20090903: xml-apis ambiguity # Change 20090814: build.properties.version introduced # Change 20090806: xerces ambiguity # -------------------------------------------------------------------------- # Version of this file in order to compare with local.build.properties -build.properties.version=2009081400 +build.properties.version=2009090300 # Servlet context prefix servlet.context.prefix=yanel @@ -91,6 +92,8 @@ duplicated.libs=commons-lang-2.1.jar,\ icu4j-2.6.1.jar,\ xalan-2.6.0.jar,\ + xml-apis-1.0.b2.jar,\ + xml-apis-1.3.02.jar,\ xercesImpl-2.6.2.jar, \ xercesImpl-2.7.1.jar From michi at wyona.com Thu Sep 3 15:37:31 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 3 16:09:27 2009 Subject: [Yanel-commits] rev 44586 - public/yanel/trunk/src/build Message-ID: <200909031337.n83DbVGg004470@cvs-extra.wyona.com> Author: michi Date: 2009-09-03 15:37:31 +0200 (Thu, 03 Sep 2009) New Revision: 44586 Modified: public/yanel/trunk/src/build/dependencies.xml public/yanel/trunk/src/build/pom-core.xml Log: upgraded to latest common lib Modified: public/yanel/trunk/src/build/dependencies.xml =================================================================== --- public/yanel/trunk/src/build/dependencies.xml 2009-09-03 13:25:41 UTC (rev 44585) +++ public/yanel/trunk/src/build/dependencies.xml 2009-09-03 13:37:31 UTC (rev 44586) @@ -39,7 +39,7 @@ - + Modified: public/yanel/trunk/src/build/pom-core.xml =================================================================== --- public/yanel/trunk/src/build/pom-core.xml 2009-09-03 13:25:41 UTC (rev 44585) +++ public/yanel/trunk/src/build/pom-core.xml 2009-09-03 13:37:31 UTC (rev 44586) @@ -40,7 +40,7 @@ wyona-org-commons wyona-org-commons - 1.0-dev-r44527 + 1.0-dev-r44584 log4j From michi at wyona.com Thu Sep 3 15:40:11 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 3 16:12:08 2009 Subject: [Yanel-commits] rev 44587 - public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw Message-ID: <200909031340.n83DeBMG004529@cvs-extra.wyona.com> Author: michi Date: 2009-09-03 15:40:11 +0200 (Thu, 03 Sep 2009) New Revision: 44587 Modified: public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java Log: use persistent requests Modified: public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java =================================================================== --- public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java 2009-09-03 13:37:31 UTC (rev 44586) +++ public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java 2009-09-03 13:40:11 UTC (rev 44587) @@ -59,13 +59,14 @@ * * {@value #SUBMITNEWPW} is passed when the user enter the new password and submits the form. * - * If the query string has pwresetid then we know that the user clicked on the link send via email. + * If the query string has pwresetid then we know that the user clicked on the link sent via email. */ public class ForgotPassword extends BasicXMLResource { private static Logger log = Logger.getLogger(ForgotPassword.class); private long totalValidHrs; + private static final String PW_RESET_ID = "pwresetid"; private static final String SUBMITFORGOTPASSWORD = "submitForgotPW"; private static final String SUBMITNEWPW = "submitNewPW"; private static final String NAMESPACE = "http://www.wyona.org/yanel/1.0"; @@ -122,15 +123,16 @@ } else { statusElement.setTextContent("Password change request was successful. Please check your email for further instructions on how to complete your request."); } - } else if (request.getParameter("pwresetid") != null && !request.getParameter("pwresetid").equals("") && !action.equals(SUBMITNEWPW)){ - User usr = findRepoUser(request.getParameter("pwresetid"), totalValidHrs); + } else if (request.getParameter(PW_RESET_ID) != null && !request.getParameter(PW_RESET_ID).equals("") && !action.equals(SUBMITNEWPW)){ + String guid = request.getParameter(PW_RESET_ID); + User usr = getUserForRequest(guid, totalValidHrs); if(usr == null) { Element statusElement = (Element) rootElement.appendChild(adoc.createElementNS(NAMESPACE, "show-message")); - statusElement.setTextContent("Unable to find forgot password request. Please try again."); + statusElement.setTextContent("Unable to find forgot password request with request ID '" + guid + "'. Maybe request ID has a typo or request has expired. Please try again."); } else { Element requestpwElement = (Element) rootElement.appendChild(adoc.createElementNS(NAMESPACE, "requestnewpw")); Element guidElement = (Element) requestpwElement.appendChild(adoc.createElementNS(NAMESPACE, "guid")); - guidElement.setTextContent(request.getParameter("pwresetid")); + guidElement.setTextContent(guid); } } else if(action.equals(SUBMITNEWPW)) { String retStr = updatePassword(request); @@ -157,52 +159,44 @@ } /** - * + * Get user for a specific request ID + * @param requestID Request ID */ - private User findRepoUser(String usrGuid, long duration_hour) throws Exception { - log.warn("DEBUG: Find user: " + usrGuid); - User upUser = null; - Map pwHM = getOblivionMap(getEnvironment().getRequest()); + private User getUserForRequest(String requestID, long duration_hour) throws Exception { + log.warn("DEBUG: Find user for request with ID: " + requestID); + if (getRealm().getRepository().existsNode(getPersistentRequestPath(requestID))) { + Node requestNode = getRealm().getRepository().getNode(getPersistentRequestPath(requestID)); - ResetPWExpire resetObj = pwHM.get(usrGuid); - if (resetObj == null) { - log.warn("DEBUG: Reset object is null!"); - - log.warn("TODO: Implementation not finished!"); -/* - Node[] children = getRealm().getRepository().getNode("nodePath").getNodes(); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilder db = null; db = dbf.newDocumentBuilder(); + Document doc = db.parse(requestNode.getInputStream()); + Element rootElem = doc.getDocumentElement(); + String userid = rootElem.getAttribute("id"); - for(int i=0; i< children.length; i++) { - Document doc = null; - doc = db.parse(children[i].getInputStream()); - Element userElem = doc.getElementById("user"); - String userid = userElem.getAttribute("id"); - String guid = getTextValue(userElem, "guid"); - long savedDateTime = getLongValue(userElem, "starttime"); - String email = getTextValue(userElem, "email"); + Element requestTimeElem = org.wyona.commons.xml.XMLHelper.getChildElements(rootElem, "request-time", null)[0]; + long savedDateTime = new Long(requestTimeElem.getAttribute("millis")).longValue(); + log.warn("Request time: " + savedDateTime); + if(isExpired(savedDateTime, duration_hour)) { + log.warn("Request is expired"); + return null; + } - if(guid.equals(usrGuid) && validGuid(savedDateTime, duration_hour)) { - upUser = realm.getIdentityManager().getUserManager().getUser(userid); - } - } -*/ - } else { - boolean check = validGuid(resetObj.getDateTime(), duration_hour); - if(check) { - upUser = realm.getIdentityManager().getUserManager().getUser(resetObj.getUserId()); - } + return realm.getIdentityManager().getUserManager().getUser(userid); + } else { + log.warn("No such request ID: " + requestID); + return null; } - return upUser; } - private boolean validGuid(long starDT, long duration_hour) throws Exception { + /** + * Check if request is expired + */ + private boolean isExpired(long starDT, long duration_hour) throws Exception { long currentDT = new Date().getTime(); long expireTime= starDT + duration_hour * Timer.ONE_HOUR; - return (expireTime>currentDT); + return (expireTime < currentDT); } private String getTextValue(Element ele, String tagName) throws Exception { @@ -217,10 +211,6 @@ } - private long getLongValue(Element ele, String tagName) throws Exception { - return Long.parseLong(getTextValue(ele,tagName)); - } - /* Determine the requested view: defaultView, submitProfile, * submitPassword,submitGroup, submitDelete * @@ -241,87 +231,57 @@ return action; } - /** - * - */ - private Map getOblivionMap(HttpServletRequest request) throws Exception { - javax.servlet.http.HttpSession session = request.getSession(true); - Map pwHM = (Map) session.getAttribute("pwreset"); - if (pwHM == null) { - pwHM = new HashMap(); - session.setAttribute("pwreset", pwHM); - } - return pwHM; - } - /** * Updates the user profile * - * @param request - * The request containing the data to update - * @param transformer + * @param request The request containing the data to update */ private String processForgotPW(HttpServletRequest request) throws Exception { String email = request.getParameter("email"); - String retStr = ""; if (email == null || ("").equals(email)) { - retStr = "E-mail address is empty."; + return "E-mail address is empty."; } else if (! EmailValidator.getInstance().isValid(email)) { - retStr = email + " is not a valid E-mail address."; + return email + " is not a valid E-mail address."; } else { User[] userList = realm.getIdentityManager().getUserManager().getUsers(true); - boolean userFnd = false; for(int i=0; i< userList.length; i++) { if (userList[i].getEmail().equals(email)) { - userFnd = true; - UUID ranUUid = UUID.randomUUID(); - String guid = ranUUid.toString(); + String guid = UUID.randomUUID().toString(); ResetPWExpire pwexp = new ResetPWExpire(userList[i].getID(), new Date().getTime(), guid, userList[i].getEmail()); - Map pwHM = getOblivionMap(getEnvironment().getRequest()); - pwHM.put(pwexp.getGuid(), pwexp); - String emailSubject = "Reset password request needs your confirmation"; - String emailBody = "Please go to the following URL to reset password: <" + getURL() + "?pwresetid=" + guid + ">."; - String hrsValid = getResourceConfigProperty(HOURS_VALID_PROPERTY_NAME); - emailBody = emailBody + "\n\nNOTE: This link is only available during the next " + hrsValid + " hours!"; - if (log.isDebugEnabled()) log.debug(emailBody); - String emailServer = getResourceConfigProperty(SMTP_HOST_PROPERTY_NAME); - int port = Integer.parseInt(getResourceConfigProperty("smtpPort")); - String from = getResourceConfigProperty("smtpFrom"); - String to = userList[i].getEmail(); - SendMail.send(emailServer, port, from, to, emailSubject, emailBody); - String xmlStrVal = generateXML(pwexp); + sendEmail(guid, userList[i].getEmail()); - String fileName = pwexp.getUserId() + ".xml"; - String filePath = ""; - filePath = File.separator + getResourceConfigProperty("change-password-requests-path") + File.separator + fileName; - writeXMLOutput(filePath, xmlStrVal); - retStr = "success"; - break; + writeXMLOutput(getPersistentRequestPath(guid), generateXML(pwexp)); + //writeXMLOutput(getResetPasswordRequestsBasePath() + "/" + pwexp.getUserId() + ".xml", generateXML(pwexp)); + return "success"; } } - if(!userFnd) { - retStr = "Unable to find user based on the "+email+" E-mail address."; - } + return "Unable to find user based on the " + email + " E-mail address."; } - return retStr; } + /** + * Generate XML containing request information which will be saved persistently + */ private String generateXML(ResetPWExpire resetObj) throws Exception { org.w3c.dom.Document adoc = org.wyona.commons.xml.XMLHelper.createDocument(NAMESPACE, "user"); Element userElement = adoc.getDocumentElement(); + userElement.setAttribute("id", resetObj.getUserId()); Element emailElement = (Element) userElement.appendChild(adoc.createElement("email")); emailElement.setTextContent(resetObj.getEmail()); - Element startTimeElement = (Element) userElement.appendChild(adoc.createElement("starttime")); - startTimeElement.setTextContent(Long.toString(resetObj.getDateTime())); + Element startTimeElement = (Element) userElement.appendChild(adoc.createElement("request-time")); + startTimeElement.setAttribute("millis", Long.toString(resetObj.getDateTime())); + java.text.DateFormat dateFormat = new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ"); + startTimeElement.setTextContent(dateFormat.format(resetObj.getDateTime())); + Element guidElement = (Element) userElement.appendChild(adoc.createElement("guid")); guidElement.setTextContent(resetObj.getGuid()); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); - TransformerFactory factory = TransformerFactory.newInstance(); Transformer t = factory.newTransformer(); // identity transform DOMSource source = new DOMSource(adoc); @@ -331,14 +291,19 @@ return baos.toString(); } - private void writeXMLOutput(String path, String outputVal) throws Exception { + /** + * Write reset password request into Yarep node + * @param path Yarep node path + * @param content XML content + */ + private void writeXMLOutput(String path, String content) throws Exception { Node fileToStore = null; if (getRealm().getRepository().existsNode(path)) { fileToStore = getRealm().getRepository().getNode(path); } else { fileToStore = getRealm().getRepository().getRootNode().addNode(path, NodeType.RESOURCE); } - InputStream in = new ByteArrayInputStream(outputVal.getBytes()); + InputStream in = new ByteArrayInputStream(content.getBytes()); OutputStream out = fileToStore.getOutputStream(); byte buffer[] = new byte[8192]; int bytesRead; @@ -353,22 +318,23 @@ * Change user password. */ private String updatePassword(HttpServletRequest request) throws Exception { - String retStr = ""; String plainPassword = request.getParameter("newPassword"); boolean confirmation = plainPassword.equals(request.getParameter("newPasswordConfirmation")); if (confirmation && !plainPassword.equals("")) { - User user = findRepoUser(request.getParameter("guid"), totalValidHrs); + String guid = request.getParameter("guid"); + User user = getUserForRequest(guid, totalValidHrs); if(user !=null) { user.setPassword(plainPassword); user.save(); - retStr = "success"; + getRealm().getRepository().delete(new org.wyona.yarep.core.Path(getPersistentRequestPath(guid))); // DEPRECATED + //TODO: YarepUtil.deleteNode(getRealm().getRepository(), getPersistentRequestPath(guid)); + return "success"; } else { - retStr = "Unable to find user for password reset."; + return "Unable to find user for password reset."; } } else { - retStr = "Either no new password was supplied or the password supplied and its confirmation password do not match."; + return "Either no new password was supplied or the password supplied and its confirmation password do not match."; } - return retStr; } @Override @@ -408,4 +374,47 @@ } return url.toString(); } + + /** + * Get base path (collection path) where reset password requests will be saved permanently + */ + private String getResetPasswordRequestsBasePath() throws Exception { + String configuredBasePath = getResourceConfigProperty("change-password-requests-path"); + String basePath; + if (configuredBasePath != null) { + if (!configuredBasePath.startsWith("/")) { + basePath = "/" + configuredBasePath; + } else { + basePath = configuredBasePath; + } + } else { + String DEFAULT_BASE_PATH = "/reset-password-requests"; + log.warn("No base path configured. Will use default value: " + DEFAULT_BASE_PATH); + basePath = DEFAULT_BASE_PATH; + } + return basePath; + } + + /** + * Send email to user requesting to reset the password + */ + private void sendEmail(String guid, String emailAddress) throws Exception { + String emailSubject = "Reset password request needs your confirmation"; + String emailBody = "Please go to the following URL to reset password: <" + getURL() + "?" + PW_RESET_ID + "=" + guid + ">."; + String hrsValid = getResourceConfigProperty(HOURS_VALID_PROPERTY_NAME); + emailBody = emailBody + "\n\nNOTE: This link is only available during the next " + hrsValid + " hours!"; + if (log.isDebugEnabled()) log.debug(emailBody); + String emailServer = getResourceConfigProperty(SMTP_HOST_PROPERTY_NAME); + int port = Integer.parseInt(getResourceConfigProperty("smtpPort")); + String from = getResourceConfigProperty("smtpFrom"); + String to = emailAddress; + SendMail.send(emailServer, port, from, to, emailSubject, emailBody); + } + + /** + * + */ + private String getPersistentRequestPath(String guid) throws Exception { + return getResetPasswordRequestsBasePath() + "/" + guid + ".xml"; + } } From michi at wyona.com Mon Sep 7 15:04:06 2009 From: michi at wyona.com (michi@wyona.com) Date: Mon Sep 7 15:36:34 2009 Subject: [Yanel-commits] rev 44629 - public/yanel/trunk/src/realms/yanel-website/content Message-ID: <200909071304.n87D46f1014883@cvs-extra.wyona.com> Author: michi Date: 2009-09-07 15:04:06 +0200 (Mon, 07 Sep 2009) New Revision: 44629 Modified: public/yanel/trunk/src/realms/yanel-website/content/28fd9012-3fc5-4196-814b-9e2aef179960 Log: note about proxy balancer added Modified: public/yanel/trunk/src/realms/yanel-website/content/28fd9012-3fc5-4196-814b-9e2aef179960 =================================================================== --- public/yanel/trunk/src/realms/yanel-website/content/28fd9012-3fc5-4196-814b-9e2aef179960 2009-09-07 12:58:16 UTC (rev 44628) +++ public/yanel/trunk/src/realms/yanel-website/content/28fd9012-3fc5-4196-814b-9e2aef179960 2009-09-07 13:04:06 UTC (rev 44629) @@ -7,7 +7,7 @@
  • Download the latest Apache httpd 2.2.x (e.g. httpd-2.2.8)
    • -
  • Install as proxy: ./configure --prefix=/usr/local/httpd-2.2.8 --enable-proxy --enable-proxy-http
    • +
  • Install as proxy: ./configure --prefix=/usr/local/httpd-2.2.8 --enable-proxy --enable-proxy-http --enable-proxy-balancer
  • make
  • make install
  • Configure virtual hosts within /usr/local/httpd-2.2.8/conf/extra/httpd-vhosts.conf
    • A sample can be found at yanel/trunk/src/httpd-2.2.3/conf/extra/httpd-vhosts.conf From michi at wyona.com Mon Sep 7 15:05:37 2009 From: michi at wyona.com (michi@wyona.com) Date: Mon Sep 7 15:38:05 2009 Subject: [Yanel-commits] rev 44630 - public/yanel/trunk/src/realms/yanel-website/content/28fd9012-3fc5-4196-814b-9e2aef179960.yarep Message-ID: <200909071305.n87D5bgR014924@cvs-extra.wyona.com> Author: michi Date: 2009-09-07 15:05:37 +0200 (Mon, 07 Sep 2009) New Revision: 44630 Modified: public/yanel/trunk/src/realms/yanel-website/content/28fd9012-3fc5-4196-814b-9e2aef179960.yarep/meta Log: meta updated Modified: public/yanel/trunk/src/realms/yanel-website/content/28fd9012-3fc5-4196-814b-9e2aef179960.yarep/meta =================================================================== --- public/yanel/trunk/src/realms/yanel-website/content/28fd9012-3fc5-4196-814b-9e2aef179960.yarep/meta 2009-09-07 13:04:06 UTC (rev 44629) +++ public/yanel/trunk/src/realms/yanel-website/content/28fd9012-3fc5-4196-814b-9e2aef179960.yarep/meta 2009-09-07 13:05:37 UTC (rev 44630) @@ -1,7 +1,7 @@ yarep_type:resource yarep_isCheckedOut:false -yarep_checkoutDate:2008-02-27T21:18:38-0700 -yarep_size:2114 -yarep_checkoutUserID:alice -yarep_lastModifed:1204172465000 -yarep_checkinDate:2008-02-27T21:21:06-0700 +yarep_size:2143 +yarep_checkoutDate:2009-09-07T14:58:53+0200 +yarep_checkoutUserID:michi +yarep_lastModifed:1252328403000 +yarep_checkinDate:2009-09-07T15:00:04+0200 From michi at wyona.com Mon Sep 7 15:09:24 2009 From: michi at wyona.com (michi@wyona.com) Date: Mon Sep 7 15:41:53 2009 Subject: [Yanel-commits] rev 44631 - public/yanel/trunk/src/httpd-2.2.3/conf/extra Message-ID: <200909071309.n87D9OD9014965@cvs-extra.wyona.com> Author: michi Date: 2009-09-07 15:09:24 +0200 (Mon, 07 Sep 2009) New Revision: 44631 Modified: public/yanel/trunk/src/httpd-2.2.3/conf/extra/httpd-vhosts.conf Log: proxy balancer example added Modified: public/yanel/trunk/src/httpd-2.2.3/conf/extra/httpd-vhosts.conf =================================================================== --- public/yanel/trunk/src/httpd-2.2.3/conf/extra/httpd-vhosts.conf 2009-09-07 13:05:37 UTC (rev 44630) +++ public/yanel/trunk/src/httpd-2.2.3/conf/extra/httpd-vhosts.conf 2009-09-07 13:09:24 UTC (rev 44631) @@ -44,3 +44,25 @@ ProxyPass / http://127.0.0.1:9090/yanel/yulup-website/ ProxyPassReverse / http://127.0.0.1:9090/yanel/yulup-website/ + + + ServerAdmin michael.wechner@wyona.com + ServerName yanel.wyona.org + ServerAlias www.yanel.org + ServerAlias yanel.org + ErrorLog logs/yanel.wyona.org-error_log + CustomLog logs/yanel.wyona.org-access_log common + + ProxyPassReverseCookiePath /yanel / + + # See (local.)yanel.properties and src/build/(local.)build.properties + # Using proxy balancer module + + BalancerMember http://127.0.0.1:9190 + BalancerMember http://127.0.0.1:9290 + + ProxyPass /javadoc balancer://mycluster/yanel/javadoc/ + ProxyPassReverse /javadoc balancer://mycluster/yanel/javadoc/ + ProxyPass / balancer://mycluster/yanel/yanel-website/ + ProxyPassReverse / balancer://mycluster/yanel/yanel-website/ + From michi at wyona.com Thu Sep 10 00:54:36 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 10 01:29:25 2009 Subject: [Yanel-commits] rev 44694 - public/yanel/trunk/src/build Message-ID: <200909092254.n89Msa2N023458@cvs-extra.wyona.com> Author: michi Date: 2009-09-10 00:54:36 +0200 (Thu, 10 Sep 2009) New Revision: 44694 Modified: public/yanel/trunk/src/build/dependencies.xml public/yanel/trunk/src/build/pom-core.xml Log: yarep upgraded beause of bug fix re getRevision Modified: public/yanel/trunk/src/build/dependencies.xml =================================================================== --- public/yanel/trunk/src/build/dependencies.xml 2009-09-09 22:41:41 UTC (rev 44693) +++ public/yanel/trunk/src/build/dependencies.xml 2009-09-09 22:54:36 UTC (rev 44694) @@ -36,7 +36,7 @@ - + @@ -72,7 +72,7 @@ - + yarep yarep-core - 1.0-dev-r44281 + 1.0-dev-r44687 yarep yarep-impl - 1.0-dev-r44281 + 1.0-dev-r44687 wyona-org-commons From michi at wyona.com Thu Sep 17 13:59:04 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 17 14:32:54 2009 Subject: [Yanel-commits] rev 44764 - in public/yanel/trunk/src/webapp: WEB-INF src/java/org/wyona/yanel/servlet Message-ID: <200909171159.n8HBx4jY017596@cvs-extra.wyona.com> Author: michi Date: 2009-09-17 13:59:02 +0200 (Thu, 17 Sep 2009) New Revision: 44764 Modified: public/yanel/trunk/src/webapp/WEB-INF/web.xml public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java Log: display a 404 if workflowable, but no live version exists and config parameter set to false Modified: public/yanel/trunk/src/webapp/WEB-INF/web.xml =================================================================== --- public/yanel/trunk/src/webapp/WEB-INF/web.xml 2009-09-17 05:26:38 UTC (rev 44763) +++ public/yanel/trunk/src/webapp/WEB-INF/web.xml 2009-09-17 11:59:02 UTC (rev 44764) @@ -39,13 +39,20 @@ xslt/login-screen.xsl - + toolbar-master-switch on + + + workflow.not-live.most-recent-version + true + + + static-content-cache-expires Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java =================================================================== --- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java 2009-09-17 05:26:38 UTC (rev 44763) +++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java 2009-09-17 11:59:02 UTC (rev 44764) @@ -95,6 +95,7 @@ private File xsltInfoAndException; private String xsltLoginScreenDefault; + private boolean displayMostRecentVersion = true; public static final String IDENTITY_MAP_KEY = "identity-map"; private static final String TOOLBAR_USECASE = "toolbar"; //TODO is this the same as YanelAuthoringUI.TOOLBAR_KEY? @@ -136,6 +137,7 @@ xsltInfoAndException = org.wyona.commons.io.FileUtil.file(servletContextRealPath, config.getInitParameter("exception-and-info-screen-xslt")); xsltLoginScreenDefault = config.getInitParameter("login-screen-xslt"); + displayMostRecentVersion = new Boolean(config.getInitParameter("workflow.not-live.most-recent-version")).booleanValue(); try { yanelInstance = Yanel.getInstance(); yanelInstance.init(); @@ -430,15 +432,18 @@ if (workflowable.isLive()) { view = workflowable.getLiveView(viewId); } else { - String message = "The viewable (V2) resource '" + res.getPath() + "' is WorkflowableV1, but has not been published yet. Instead the live version, the most recent version will be displayed!"; + String message = "The viewable (V2) resource '" + res.getPath() + "' is WorkflowableV1, but has not been published yet."; log.warn(message); - view = ((ViewableV2) res).getView(viewId); - - // TODO: Maybe sending a 404 instead the most recent version should be configurable! - /* - do404(request, response, doc, message); - return; - */ + // TODO: Make this configurable per realm + if (displayMostRecentVersion) { + log.warn("Instead the live version, the most recent version will be displayed!"); + view = ((ViewableV2) res).getView(viewId); + } else { + log.warn("Instead the live version, a 404 will be displayed!"); + // TODO: Instead a 404 one might want to show a different kind of screen + do404(request, response, doc, message); + return; + } } } else { view = ((ViewableV2) res).getView(viewId); From michi at wyona.com Thu Sep 17 14:02:40 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 17 14:36:30 2009 Subject: [Yanel-commits] rev 44765 - public/yanel/trunk/src/webapp/WEB-INF Message-ID: <200909171202.n8HC2eJK017676@cvs-extra.wyona.com> Author: michi Date: 2009-09-17 14:02:40 +0200 (Thu, 17 Sep 2009) New Revision: 44765 Modified: public/yanel/trunk/src/webapp/WEB-INF/web.xml Log: note re backwards compatibility added Modified: public/yanel/trunk/src/webapp/WEB-INF/web.xml =================================================================== --- public/yanel/trunk/src/webapp/WEB-INF/web.xml 2009-09-17 11:59:02 UTC (rev 44764) +++ public/yanel/trunk/src/webapp/WEB-INF/web.xml 2009-09-17 12:02:40 UTC (rev 44765) @@ -49,7 +49,7 @@ workflow.not-live.most-recent-version - true + true From guillaume at wyona.com Thu Sep 24 09:43:15 2009 From: guillaume at wyona.com (guillaume@wyona.com) Date: Thu Sep 24 10:18:00 2009 Subject: [Yanel-commits] rev 44850 - public/yanel/trunk/src/build/targets Message-ID: <200909240743.n8O7hFQ5017587@cvs-extra.wyona.com> Author: guillaume Date: 2009-09-24 09:43:15 +0200 (Thu, 24 Sep 2009) New Revision: 44850 Modified: public/yanel/trunk/src/build/targets/resources.xml Log: Forced javac's source and target Java versions to minimal constant values to avoid that the 'clean' task fails because of incompatible Yanel Ant helper classes when downgrading JDK! Modified: public/yanel/trunk/src/build/targets/resources.xml =================================================================== --- public/yanel/trunk/src/build/targets/resources.xml 2009-09-23 21:27:56 UTC (rev 44849) +++ public/yanel/trunk/src/build/targets/resources.xml 2009-09-24 07:43:15 UTC (rev 44850) @@ -14,6 +14,8 @@ From michi at wyona.com Thu Sep 24 16:31:40 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 24 17:06:26 2009 Subject: [Yanel-commits] rev 44858 - public/yanel/trunk/src/realms/from-scratch-realm-template/res-configs Message-ID: <200909241431.n8OEVeUX018543@cvs-extra.wyona.com> Author: michi Date: 2009-09-24 16:31:39 +0200 (Thu, 24 Sep 2009) New Revision: 44858 Modified: public/yanel/trunk/src/realms/from-scratch-realm-template/res-configs/create-new-page.html.yanel-rc Log: world time resource commented for the moment Modified: public/yanel/trunk/src/realms/from-scratch-realm-template/res-configs/create-new-page.html.yanel-rc =================================================================== --- public/yanel/trunk/src/realms/from-scratch-realm-template/res-configs/create-new-page.html.yanel-rc 2009-09-24 13:29:11 UTC (rev 44857) +++ public/yanel/trunk/src/realms/from-scratch-realm-template/res-configs/create-new-page.html.yanel-rc 2009-09-24 14:31:39 UTC (rev 44858) @@ -23,6 +23,12 @@ Asset (Upload File) + + - + Start exporting source from SVN, revision: ${yanel.revision} - - - - - REVISION From michi at wyona.com Thu Sep 24 22:26:11 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 24 23:00:58 2009 Subject: [Yanel-commits] rev 44860 - public/yanel/trunk/src/realms/welcome-admin/yanel/data/xslt Message-ID: <200909242026.n8OKQB0H018999@cvs-extra.wyona.com> Author: michi Date: 2009-09-24 22:26:10 +0200 (Thu, 24 Sep 2009) New Revision: 44860 Modified: public/yanel/trunk/src/realms/welcome-admin/yanel/data/xslt/welcome.xsl Log: wording improved Modified: public/yanel/trunk/src/realms/welcome-admin/yanel/data/xslt/welcome.xsl =================================================================== --- public/yanel/trunk/src/realms/welcome-admin/yanel/data/xslt/welcome.xsl 2009-09-24 20:14:28 UTC (rev 44859) +++ public/yanel/trunk/src/realms/welcome-admin/yanel/data/xslt/welcome.xsl 2009-09-24 20:26:10 UTC (rev 44860) @@ -47,16 +47,16 @@
    • What is a realm?
    • Add a realm
    • More information can be found within the Yanel documentation.
    • Turn on toolbar
      • -
    • Download Yulup
    • Find Updates
    • Session Manager
      • +
    • Download Yulup for editing web-pages independently of Yanel.
      • From michi at wyona.com Thu Sep 24 22:42:58 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 24 23:17:47 2009 Subject: [Yanel-commits] rev 44862 - public/yanel/trunk/src/realms/yanel-website/content Message-ID: <200909242042.n8OKgweI019102@cvs-extra.wyona.com> Author: michi Date: 2009-09-24 22:42:58 +0200 (Thu, 24 Sep 2009) New Revision: 44862 Modified: public/yanel/trunk/src/realms/yanel-website/content/doap.rdf Log: URLs fixed Modified: public/yanel/trunk/src/realms/yanel-website/content/doap.rdf =================================================================== --- public/yanel/trunk/src/realms/yanel-website/content/doap.rdf 2009-09-24 20:40:07 UTC (rev 44861) +++ public/yanel/trunk/src/realms/yanel-website/content/doap.rdf 2009-09-24 20:42:58 UTC (rev 44862) @@ -10,17 +10,17 @@ 2007-06-11 Wyona Yanel - - + + Content Management Framework Everything is content management (WCMS/Wiki, DMS, CRM, ECM, ERP, PIM/E-Mail, DRM, ...) and Yanel is a humble attempt to provide a solution for all your content management needs by offering an Open Source service oriented Content Management Framework written in Java. - + - + - + Java From michi at wyona.com Thu Sep 24 23:00:05 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 24 23:34:53 2009 Subject: [Yanel-commits] rev 44863 - public/yanel/trunk/src/build Message-ID: <200909242100.n8OL05dh019164@cvs-extra.wyona.com> Author: michi Date: 2009-09-24 23:00:05 +0200 (Thu, 24 Sep 2009) New Revision: 44863 Modified: public/yanel/trunk/src/build/build.xml Log: some cleanup/grouping Modified: public/yanel/trunk/src/build/build.xml =================================================================== --- public/yanel/trunk/src/build/build.xml 2009-09-24 20:42:58 UTC (rev 44862) +++ public/yanel/trunk/src/build/build.xml 2009-09-24 21:00:05 UTC (rev 44863) @@ -172,20 +172,21 @@ - + + + - - + Start exporting source from SVN, revision: ${yanel.revision} - + REVISION From michi at wyona.com Thu Sep 24 23:10:22 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 24 23:45:10 2009 Subject: [Yanel-commits] rev 44864 - public/yanel/trunk Message-ID: <200909242110.n8OLAMCT019207@cvs-extra.wyona.com> Author: michi Date: 2009-09-24 23:10:22 +0200 (Thu, 24 Sep 2009) New Revision: 44864 Modified: public/yanel/trunk/README.txt Log: wording improved Modified: public/yanel/trunk/README.txt =================================================================== --- public/yanel/trunk/README.txt 2009-09-24 21:00:05 UTC (rev 44863) +++ public/yanel/trunk/README.txt 2009-09-24 21:10:22 UTC (rev 44864) @@ -17,9 +17,9 @@ 1) Configure Yanel by running "configure" - After "configure" has finished, you may want to review the contents of - ./src/build/local.build.properties to better understand the parameters - that "build" will use. + After "configure" has finished, you may want to review the contents of + the file './src/build/local.build.properties' to better understand the parameters + which the "build" process will be using. 2) Build Yanel by running "build" @@ -27,7 +27,7 @@ 3.1) Run within Tomcat: "yanel start/stop" to start or stop Tomcat 3.2) Run within Jetty: "yanel start-jetty" to start Jetty 3.3) Run within Command Line: "yanel /hello/world.html" - 3.4) Run continuous integration: "./src/build/targets/continuous-integration/CI" + 3.4) Run continuous integration: "./src/build/targets/continuous-integration/reCI" 4) Browse to http://127.0.0.1:8080/yanel/ From michi at wyona.com Thu Sep 24 23:19:28 2009 From: michi at wyona.com (michi@wyona.com) Date: Thu Sep 24 23:54:16 2009 Subject: [Yanel-commits] rev 44865 - public/yanel/trunk/src/build Message-ID: <200909242119.n8OLJSiM019252@cvs-extra.wyona.com> Author: michi Date: 2009-09-24 23:19:28 +0200 (Thu, 24 Sep 2009) New Revision: 44865 Modified: public/yanel/trunk/src/build/build.xml Log: get most recent revision of remote server Modified: public/yanel/trunk/src/build/build.xml =================================================================== --- public/yanel/trunk/src/build/build.xml 2009-09-24 21:10:22 UTC (rev 44864) +++ public/yanel/trunk/src/build/build.xml 2009-09-24 21:19:28 UTC (rev 44865) @@ -172,11 +172,19 @@ + + + + + + Most recent revision on remote server: ${svn.info.rev} + + From michi at wyona.com Mon Sep 28 09:22:29 2009 From: michi at wyona.com (michi@wyona.com) Date: Mon Sep 28 09:58:42 2009 Subject: [Yanel-commits] rev 44876 - public/yanel/trunk Message-ID: <200909280722.n8S7MT5l031901@cvs-extra.wyona.com> Author: michi Date: 2009-09-28 09:22:28 +0200 (Mon, 28 Sep 2009) New Revision: 44876 Modified: public/yanel/trunk/yanel.sh Log: setting JAVA_HOME made user friendlier on Mac OS X Modified: public/yanel/trunk/yanel.sh =================================================================== --- public/yanel/trunk/yanel.sh 2009-09-27 18:53:23 UTC (rev 44875) +++ public/yanel/trunk/yanel.sh 2009-09-28 07:22:28 UTC (rev 44876) @@ -3,19 +3,36 @@ SCRIPT_DIR=$PWD #SCRIPT_DIR=$PWD/`dirname $0` +JAVA_HOME_MACOSX=/System/Library/Frameworks/JavaVM.framework/Home + # ----- Check for JAVA_HOME JAVA_HOME="$JAVA_HOME" if [ "$JAVA_HOME" = "" ];then echo "ERROR: No JAVA_HOME set!" echo " Have you installed JDK (Java Development Kit)? If so, then set JAVA_HOME ..." echo "" - echo " MacOS X : Depending on the shell you're using either use" - echo " setenv JAVA_HOME /System/Library/Frameworks/JavaVM.framework/Home" - echo " or" - echo " export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home" - echo " Linux : export JAVA_HOME=/usr/local/jdk-1.5.0 (whereas '/usr/local/jdk-1.5.0' is just an example path)" - echo " Windows : Click Start, click 'My Computer', right click on window, select 'Properties', click the 'Advanced' tab, click 'Environment Variables'" - exit 1 + echo " Mac OS X : Depending on the shell you're using either use" + echo " export JAVA_HOME=$JAVA_HOME_MACOSX" + echo " or" + echo " setenv JAVA_HOME $JAVA_HOME_MACOSX" + echo " Linux : export JAVA_HOME=/usr/local/jdk-1.5.0 (whereas '/usr/local/jdk-1.5.0' is just an example path)" + echo " Windows : Click Start, click 'My Computer', right click on window, select 'Properties', click the 'Advanced' tab, click 'Environment Variables'" + echo "" + if [ -d $JAVA_HOME_MACOSX ]; then + echo "INFO: You seem to use Mac OS X as operating system. Do you want to set '$JAVA_HOME_MACOSX' as JAVA_HOME? (YES/no)" + read ANSWER + if [ "$ANSWER" = "no" ]; then + echo "WARNING: JAVA_HOME has not been set. Please make sure to set it manually and then re-run this script." + exit 1 + else + export JAVA_HOME=$JAVA_HOME_MACOSX + echo "INFO: JAVA_HOME has been set to '$JAVA_HOME_MACOSX' while processing this shell script." + echo "" + sleep 3 + fi + else + exit 1 + fi fi # ----- Check Java version From michi at wyona.com Mon Sep 28 11:23:28 2009 From: michi at wyona.com (michi@wyona.com) Date: Mon Sep 28 11:58:45 2009 Subject: [Yanel-commits] rev 44886 - public/yanel/contributions/ajax-components Message-ID: <200909280923.n8S9NSOi000576@cvs-extra.wyona.com> Author: michi Date: 2009-09-28 11:23:28 +0200 (Mon, 28 Sep 2009) New Revision: 44886 Modified: public/yanel/contributions/ajax-components/build.xml Log: memory increased and Compiler added, but still commented Modified: public/yanel/contributions/ajax-components/build.xml =================================================================== --- public/yanel/contributions/ajax-components/build.xml 2009-09-28 08:35:09 UTC (rev 44885) +++ public/yanel/contributions/ajax-components/build.xml 2009-09-28 09:23:28 UTC (rev 44886) @@ -41,8 +41,20 @@ + Module name: ${module.name} + Component build directory: ${component.build.dir} + + + + From michi at wyona.com Mon Sep 28 11:23:43 2009 From: michi at wyona.com (michi@wyona.com) Date: Mon Sep 28 11:59:00 2009 Subject: [Yanel-commits] rev 44887 - public/yanel/contributions/ajax-components Message-ID: <200909280923.n8S9NhUT000618@cvs-extra.wyona.com> Author: michi Date: 2009-09-28 11:23:43 +0200 (Mon, 28 Sep 2009) New Revision: 44887 Modified: public/yanel/contributions/ajax-components/README.txt Log: formatting Modified: public/yanel/contributions/ajax-components/README.txt =================================================================== --- public/yanel/contributions/ajax-components/README.txt 2009-09-28 09:23:28 UTC (rev 44886) +++ public/yanel/contributions/ajax-components/README.txt 2009-09-28 09:23:43 UTC (rev 44887) @@ -12,7 +12,10 @@ - the operating system specific gwt dev lib name within local.build.properties - 3) Start building components (e.g. "ant google.compile -Dcomponent.home.dir=src/hello-world". A build directory should be created within the component directory, e.g. src/hello-world/build) + 3) Start building components, e.g. + ant google.compile -Dcomponent.home.dir=src/hello-world + A build directory should be created within the component directory, e.g. + src/hello-world/build 4) a) Test components (e.g. open a browser and open one of the test files, for example src/hello-world/build/org.wyona.yanel.gwt.helloworld.HelloWorld/TestHelloWorld.html) b) run target google.hostmode to open the gwt host mode browser (e.g. "ant google.hostmode -Dcomponent.home.dir=src/hello-world") From michi at wyona.com Mon Sep 28 11:24:50 2009 From: michi at wyona.com (michi@wyona.com) Date: Mon Sep 28 12:00:49 2009 Subject: [Yanel-commits] rev 44888 - public/yanel/contributions/ajax-components Message-ID: <200909280924.n8S9Oosw000661@cvs-extra.wyona.com> Author: michi Date: 2009-09-28 11:24:50 +0200 (Mon, 28 Sep 2009) New Revision: 44888 Modified: public/yanel/contributions/ajax-components/build.properties Log: mac os x example added Modified: public/yanel/contributions/ajax-components/build.properties =================================================================== --- public/yanel/contributions/ajax-components/build.properties 2009-09-28 09:23:43 UTC (rev 44887) +++ public/yanel/contributions/ajax-components/build.properties 2009-09-28 09:24:50 UTC (rev 44888) @@ -1,8 +1,10 @@ # Path to GWT package +#gwt.home=/Users/michaelwechner/local/gwt-mac-1.7.1 #gwt.home=/home/michi/local/gwt-linux-1.4.61 gwt.home=C:/JAVA_LIB/gwt-windows-1.4.61 # GWT dev library +#gwt.dev.lib=gwt-dev-mac.jar #gwt.dev.lib=gwt-dev-linux.jar gwt.dev.lib=gwt-dev-windows.jar From michi at wyona.com Mon Sep 28 11:29:31 2009 From: michi at wyona.com (michi@wyona.com) Date: Mon Sep 28 12:04:48 2009 Subject: [Yanel-commits] rev 44889 - public/yanel/contributions/ajax-components Message-ID: <200909280929.n8S9TVvt000704@cvs-extra.wyona.com> Author: michi Date: 2009-09-28 11:29:30 +0200 (Mon, 28 Sep 2009) New Revision: 44889 Modified: public/yanel/contributions/ajax-components/build.xml Log: use new Compiler and war argument fixed Modified: public/yanel/contributions/ajax-components/build.xml =================================================================== --- public/yanel/contributions/ajax-components/build.xml 2009-09-28 09:24:50 UTC (rev 44888) +++ public/yanel/contributions/ajax-components/build.xml 2009-09-28 09:29:30 UTC (rev 44889) @@ -44,23 +44,30 @@ Module name: ${module.name} Component build directory: ${component.build.dir} - + From michi at wyona.com Mon Sep 28 12:00:06 2009 From: michi at wyona.com (michi@wyona.com) Date: Mon Sep 28 12:35:23 2009 Subject: [Yanel-commits] rev 44890 - public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client Message-ID: <200909281000.n8SA06oI000785@cvs-extra.wyona.com> Author: michi Date: 2009-09-28 12:00:06 +0200 (Mon, 28 Sep 2009) New Revision: 44890 Added: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java Log: i18n started Added: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java =================================================================== --- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java (rev 0) +++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java 2009-09-28 10:00:06 UTC (rev 44890) @@ -0,0 +1,29 @@ +/* + * Copyright 2008 Wyona + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.wyona.security.gwt.accesspolicyeditor.client; + +/** + * + */ +public class I18n { + + /** + * + */ + public static String getLabel(String key, String language) { + return "WARNING: No such language '" + language + "' implemented!"; + } +} From michi at wyona.com Mon Sep 28 12:14:44 2009 From: michi at wyona.com (michi@wyona.com) Date: Mon Sep 28 12:50:02 2009 Subject: [Yanel-commits] rev 44891 - public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client Message-ID: <200909281014.n8SAEi6U000829@cvs-extra.wyona.com> Author: michi Date: 2009-09-28 12:14:44 +0200 (Mon, 28 Sep 2009) New Revision: 44891 Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java Log: I18n started Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java =================================================================== --- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java 2009-09-28 10:00:06 UTC (rev 44890) +++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java 2009-09-28 10:14:44 UTC (rev 44891) @@ -30,6 +30,7 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.HasVerticalAlignment; import com.google.gwt.user.client.ui.KeyboardListenerAdapter; +import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.TextBox; @@ -62,6 +63,9 @@ * */ public void onModuleLoad() { + //String language = "en"; + String language = "de"; + String identitiesURL = "DEFAULT-identities-and-usecases.xml"; String readPolicyURL = "DEFAULT-policy.xml"; String cancelURL = "DEFAULT-cancel.html"; @@ -93,12 +97,14 @@ VerticalPanel vp = new VerticalPanel(); RootPanel.get("access-policy-editor-hook").add(vp); - VerticalPanel searchFilterVP = new VerticalPanel(); - vp.add(searchFilterVP); + HorizontalPanel searchFilterPanel = new HorizontalPanel(); + vp.add(searchFilterPanel); + searchFilterPanel.add(new Label(I18n.getLabel("search-box-label", language))); + final TextBox searchTB = new TextBox(); searchTB.setVisibleLength(30); - searchFilterVP.add(searchTB); + searchFilterPanel.add(searchTB); searchTB.addKeyboardListener( new KeyboardListenerAdapter() { @@ -131,21 +137,22 @@ // filterList(list, filter.getText()); } }); - - -// Button searchButton = new Button("Search User or Group", new ClickListener() { -// public void onClick(Widget sender) { -// int itemCount = identitiesLBW.getListBox().getItemCount(); -// for (int i = 0; i < itemCount; i++) { -// String itemText = identitiesLBW.getListBox().getItemText(i); -// if (itemText.indexOf(searchTB.getText()) >= 0) Window.alert("Result: " + itemText); -// -// } -// } -// -// }); -// searchFilterVP.add(searchButton); +/* TODO: Is this still needed?! + Button searchButton = new Button("Search User or Group", new ClickListener() { + public void onClick(Widget sender) { + int itemCount = identitiesLBW.getListBox().getItemCount(); + for (int i = 0; i < itemCount; i++) { + String itemText = identitiesLBW.getListBox().getItemText(i); + if (itemText.indexOf(searchTB.getText()) >= 0) Window.alert("Result: " + itemText); + + } + } + + }); + searchFilterPanel.add(searchButton); +*/ + HorizontalPanel hp = new HorizontalPanel(); hp.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); vp.add(hp); Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java =================================================================== --- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java 2009-09-28 10:00:06 UTC (rev 44890) +++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java 2009-09-28 10:14:44 UTC (rev 44891) @@ -24,6 +24,17 @@ * */ public static String getLabel(String key, String language) { - return "WARNING: No such language '" + language + "' implemented!"; + if (language.equals("en")) { + if (key.equals("search-box-label")) { + return "Search users and groups: "; + } + } else if (language.equals("de")) { + if (key.equals("search-box-label")) { + return "Suche Benutzer/Gruppen: "; + } + } else { + return "WARNING: No such language '" + language + "' implemented!"; + } + return "WARNING: No such key '" + key + "' and language '" + language + "' implemented!"; } } From michi at wyona.com Mon Sep 28 12:24:35 2009 From: michi at wyona.com (michi@wyona.com) Date: Mon Sep 28 12:59:53 2009 Subject: [Yanel-commits] rev 44893 - public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client Message-ID: <200909281024.n8SAOZGP000953@cvs-extra.wyona.com> Author: michi Date: 2009-09-28 12:24:35 +0200 (Mon, 28 Sep 2009) New Revision: 44893 Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java Log: use i18n also within sub-widgets Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java =================================================================== --- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java 2009-09-28 10:20:20 UTC (rev 44892) +++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/AccessPolicyEditor.java 2009-09-28 10:24:35 UTC (rev 44893) @@ -63,8 +63,8 @@ * */ public void onModuleLoad() { - //String language = "en"; - String language = "de"; + String language = "en"; + //String language = "de"; String identitiesURL = "DEFAULT-identities-and-usecases.xml"; String readPolicyURL = "DEFAULT-policy.xml"; @@ -88,7 +88,7 @@ identitiesLBW.set(visibleItemCount, identitiesAllUsers, identitiesAllGroups); - policyLBW = new PolicyListBoxWidget(visibleItemCount, policyUsers, policyGroups, useInheritedPolicies); + policyLBW = new PolicyListBoxWidget(visibleItemCount, policyUsers, policyGroups, useInheritedPolicies, language); getPolicy(readPolicyURL); Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java =================================================================== --- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java 2009-09-28 10:20:20 UTC (rev 44892) +++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/I18n.java 2009-09-28 10:24:35 UTC (rev 44893) @@ -27,10 +27,14 @@ if (language.equals("en")) { if (key.equals("search-box-label")) { return "Search users and groups: "; + } else if(key.equals("inherit-rights-label")) { + return "Inherit rights from parent policies"; } } else if (language.equals("de")) { if (key.equals("search-box-label")) { return "Suche Benutzer/Gruppen: "; + } else if(key.equals("inherit-rights-label")) { + return "Uebernehme vererbte Rechte der Eltern-Policies"; } } else { return "WARNING: No such language '" + language + "' implemented!"; Modified: public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java =================================================================== --- public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java 2009-09-28 10:20:20 UTC (rev 44892) +++ public/yanel/contributions/ajax-components/src/access-policy-editor/java/org/wyona/security/gwt/accesspolicyeditor/client/PolicyListBoxWidget.java 2009-09-28 10:24:35 UTC (rev 44893) @@ -49,12 +49,12 @@ /** * */ - public PolicyListBoxWidget(int visibleItemCount, User[] users, Group[] groups, boolean useInheritedPolicies) { + public PolicyListBoxWidget(int visibleItemCount, User[] users, Group[] groups, boolean useInheritedPolicies, String language) { initWidget(vp); vp.add(new Label("Policy")); - policyInheritanceCB = new CheckBox("Inherit rights from parent policies"); + policyInheritanceCB = new CheckBox(I18n.getLabel("inherit-rights-label", language)); setInheritRightsFlag(useInheritedPolicies); vp.add(policyInheritanceCB); From guillaume at wyona.com Tue Sep 29 15:25:46 2009 From: guillaume at wyona.com (guillaume@wyona.com) Date: Tue Sep 29 16:01:12 2009 Subject: [Yanel-commits] rev 44911 - in public/yanel/trunk: src/build src/build/targets src/neutron tools Message-ID: <200909291325.n8TDPk0d007823@cvs-extra.wyona.com> Author: guillaume Date: 2009-09-29 15:25:46 +0200 (Tue, 29 Sep 2009) New Revision: 44911 Added: public/yanel/trunk/src/neutron/pom.xml Removed: public/yanel/trunk/src/build/pom-neutron.xml Modified: public/yanel/trunk/src/build/build.xml public/yanel/trunk/src/build/targets/build-artifacts.build.xml public/yanel/trunk/tools/ Log: Now using Yanel-independant scripts to build Neutron's Maven artifact. Issue: 4963 Modified: public/yanel/trunk/src/build/build.xml =================================================================== --- public/yanel/trunk/src/build/build.xml 2009-09-29 12:26:14 UTC (rev 44910) +++ public/yanel/trunk/src/build/build.xml 2009-09-29 13:25:46 UTC (rev 44911) @@ -2,6 +2,7 @@ @@ -148,7 +149,7 @@ - + Deleted: public/yanel/trunk/src/build/pom-neutron.xml =================================================================== --- public/yanel/trunk/src/build/pom-neutron.xml 2009-09-29 12:26:14 UTC (rev 44910) +++ public/yanel/trunk/src/build/pom-neutron.xml 2009-09-29 13:25:46 UTC (rev 44911) @@ -1,19 +0,0 @@ - - - - 4.0.0 - wyona-org-neutron - wyona-neutron - @VERSION@ - - - - Modified: public/yanel/trunk/src/build/targets/build-artifacts.build.xml =================================================================== --- public/yanel/trunk/src/build/targets/build-artifacts.build.xml 2009-09-29 12:26:14 UTC (rev 44910) +++ public/yanel/trunk/src/build/targets/build-artifacts.build.xml 2009-09-29 13:25:46 UTC (rev 44911) @@ -2,7 +2,10 @@ xmlns:artifact="antlib:org.apache.maven.artifact.ant" > + + + @@ -42,44 +45,4 @@ - - - - - - - - - - - - - - - - - @VERSION@ - - - - - - - - - - - - - - - - - Copied: public/yanel/trunk/src/neutron/pom.xml (from rev 44809, public/yanel/trunk/src/build/pom-neutron.xml) =================================================================== --- public/yanel/trunk/src/neutron/pom.xml (rev 0) +++ public/yanel/trunk/src/neutron/pom.xml 2009-09-29 13:25:46 UTC (rev 44911) @@ -0,0 +1,19 @@ + + + + 4.0.0 + wyona-org-neutron + wyona-neutron + @VERSION@ + + + + Property changes on: public/yanel/trunk/src/neutron/pom.xml ___________________________________________________________________ Name: svn:mergeinfo + Property changes on: public/yanel/trunk/tools ___________________________________________________________________ Name: svn:externals - apache-ant -r42276 http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1 apache-ant_extras -r42238 http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1_extras eclipse.settings http://svn.wyona.com/repos/public/0_tools/eclipse-3.settings + apache-ant -r42265 http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1 apache-ant_extras -r44910 http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1_extras eclipse.settings http://svn.wyona.com/repos/public/0_tools/eclipse-3.settings From hudson at wyona.com Tue Sep 29 15:38:03 2009 From: hudson at wyona.com (hudson@wyona.com) Date: Tue Sep 29 16:12:58 2009 Subject: [Yanel-commits] Build failed in Hudson: Yanel-trunk #409 Message-ID: <2977372.5791254231483947.JavaMail.guillaume@wc-13.wyona.com> See http://195.226.6.72:8080/job/Yanel-trunk/409/changes Changes: [Guillaume] Now using Yanel-independant scripts to build Neutron's Maven artifact. Issue: 4963 [Guillaume] Now using Yanel-independant scripts to build Maven artifacts, which are only used to produce source JARs for debugging Yarep ATM. [Guillaume] Added minimal generic scripts to invoke Ant here to avoid copy-pasting them in almost all Wyona subprojects (Note: Yanel use its own more sophisticated scripts). ------------------------------------------ [...truncated 2233 lines...] [echo] Resource Home Directory: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/contributions/resources/redirect copy-dependencies: dependencies: [artifact:dependencies] There were no dependencies specified init: copy-dependencies: [echo] WARN: No 'src' attribute specified (package: org.wyona.yanel.impl.resources.example) [echo] YANEL_HOME is set to: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy dependencies: [artifact:dependencies] There were no dependencies specified init: [echo] Initialize build [echo] Resource Home Directory: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/realms/welcome-admin/yanel/resources/show-realms copy-dependencies: dependencies: [artifact:dependencies] There were no dependencies specified init: yanel-resource-type.copy-dependencies: copy-dependencies: [copy] Copying 2 files to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/build/webapps/yanel/WEB-INF/classes Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml init: [echo] INFO: Building with Apache Ant version 1.7.1 compiled on June 27 2008 and Java version 1.5 [echo] Yanel Home Dir: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/../../ generate-realms-build: Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml init: [echo] INFO: Building with Apache Ant version 1.7.1 compiled on June 27 2008 and Java version 1.5 [echo] Yanel Home Dir: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/../../ generate-realms-build-from-default: Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml init: [echo] INFO: Building with Apache Ant version 1.7.1 compiled on June 27 2008 and Java version 1.5 [echo] Yanel Home Dir: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/../../ generate-realms-build-from-local: deploy-libs-of-realms: init: [echo] Init ... deploy-realms: init: [echo] Init ... deploy-realm-with-id-javadoc: init: [echo] Init ... deploy-realm-with-id-yanel-website: [copy] Copying 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/build/webapps/yanel/WEB-INF/lib init: [echo] Init ... deploy-realm-with-id-test-cases: init: [echo] Init ... deploy-realm-with-id-test: init: [echo] Init ... deploy-realm-with-id-from-scratch-realm-template: init: [echo] Init ... deploy-realm-with-id-welcome: [copy] Copying 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/build/webapps/yanel/WEB-INF/lib Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml init: [echo] INFO: Building with Apache Ant version 1.7.1 compiled on June 27 2008 and Java version 1.5 [echo] Yanel Home Dir: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/../../ remove-ambiguous-libs: [echo] INFO: Remove ambiguous libs (http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/build/webapps/yanel/WEB-INF/lib/) : commons-lang-2.1.jar,icu4j-2.6.1.jar,xalan-2.6.0.jar,xml-apis-1.0.b2.jar,xml-apis-1.3.02.jar,xercesImpl-2.6.2.jar, xercesImpl-2.7.1.jar deploy: Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml deploy-to-tomcat-cluster-node1: [echo] Copy webapp (http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/webapps) : Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml init: [echo] INFO: Building with Apache Ant version 1.7.1 compiled on June 27 2008 and Java version 1.5 [echo] Yanel Home Dir: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/../../ copy-webapp-files-to-tomcat-cluster-node1: [copy] Copying 838 files to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/webapps/yanel [copy] Copied 109 empty directories to 1 empty directory under http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/webapps/yanel [touch] Creating http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/build/logs/log4j-cnode1.log Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml patch-tomcat-cluster-node-1-ssl-port: Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml ask-to-copy-endorsed-stax-api-to-node1: [echo] IMPORTANT: Please note that your Tomcat might already contain an endorsed stax-api library at 'http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/common/endorsed/'. Please make sure to resolve any conflicts! [input] skipping input as property answer has already been set. Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml do-copy-endorsed-stax-api-to-node1: [copy] Copying 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/common/endorsed [echo] INFO: stax-api-1.0.jar has been copied! Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml ask-to-copy-endorsed-stax-impl-to-node1: [echo] IMPORTANT: Please note that your Tomcat might already contain an endorsed stax-impl library at 'http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/common/endorsed/'. Please make sure to resolve any conflicts! [input] skipping input as property answer has already been set. Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml do-copy-endorsed-stax-impl-to-node1: [copy] Copying 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/common/endorsed [echo] INFO: stax-1.1.2-dev.jar has been copied! Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml deploy-to-tomcat-cluster-node2: Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml final-message: [echo] [echo] [echo] ***************************************************************** [echo] * [echo] * You have successfully built Yanel 1.0-dev (Revision REVISION) [echo] * [echo] * [echo] * Start using Yanel by typing [echo] * [echo] * Tomcat: ./yanel.sh start [echo] * [echo] * and browse to [echo] * [echo] * http://127.0.0.1:8080/yanel/ [echo] * [echo] * [echo] * Thanks for using Yanel [echo] * [echo] ***************************************************************** BUILD SUCCESSFUL Total time: 4 minutes 25 seconds + tools/apache-ant/bin/ant -f tools/apache-tomcat/build.xml configure-host -Dtomcat.home.dir=../../local/apache-tomcat-5.5.20 -Dhost=localhost -Dhost.HTTP.port=8180 -Dhost.HTTPS.port=8543 -Dhost.SHUTDOWN.port=8105 -Dhost.AJP.port=8109 Buildfile: tools/apache-tomcat/build.xml configure-host: [copy] Copying 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/conf [move] Moving 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/conf [move] Moving 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/conf BUILD SUCCESSFUL Total time: 0 seconds + ./yanel.sh start Apache Ant version 1.7.1 compiled on June 27 2008 INFO: Starting Yanel... Buildfile: src/build/build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml start-tomcat: Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml startup-tomcat-windows: Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml startup-tomcat-unix: Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml startup-tomcat-unix-node1: [echo] Starting Tomcat (http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/bin/startup.sh) ... Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml startup-tomcat-unix-node2: [echo] ***************************************************************** [echo] * [echo] * You have successfully started Yanel 1.0-dev (Revision REVISION) [echo] * [echo] * [echo] * Start your Browser and visit [echo] * [echo] * http://127.0.0.1:8080/yanel/ [echo] * [echo] * Thanks for using Yanel [echo] * [echo] ***************************************************************** Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml delete-building-hint: BUILD SUCCESSFUL Total time: 3 seconds + cat + ./build.sh test -Dwebtest.home.dir=/opt/canoo/webtest-3.0-R_1758 -Dwebtest.config.host=localhost -Dwebtest.config.protocol=http -Dwebtest.config.port=8180 -Dheadless= Apache Ant version 1.7.1 compiled on June 27 2008 INFO: Building Yanel... Buildfile: src/build/build.xml Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml test: Duplicated project name in import. Project build-artifacts defined first in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/tools/apache-ant_extras/artifacts.build.xml and again in http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml BUILD FAILED http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/test.xml :5: The following error occurred while executing this line: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/test/build.xml :28: The following error occurred while executing this line: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml :5: Cannot find ${yanel.source.home}/tools/apache-ant_extras/artifacts.build.xml imported from http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Total time: 2 seconds Recording test results From guillaume at wyona.com Tue Sep 29 16:10:07 2009 From: guillaume at wyona.com (guillaume@wyona.com) Date: Tue Sep 29 16:47:24 2009 Subject: [Yanel-commits] rev 44917 - public/yanel/trunk/tools Message-ID: <200909291410.n8TEA7Mv008175@cvs-extra.wyona.com> Author: guillaume Date: 2009-09-29 16:10:07 +0200 (Tue, 29 Sep 2009) New Revision: 44917 Modified: public/yanel/trunk/tools/ Log: Ooops, I broke Yanel's build system in r44911! :/ Property changes on: public/yanel/trunk/tools ___________________________________________________________________ Name: svn:externals - apache-ant -r42265 http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1 apache-ant_extras -r44910 http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1_extras eclipse.settings http://svn.wyona.com/repos/public/0_tools/eclipse-3.settings + apache-ant -r42265 http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1 apache-ant_extras -r44916 http://svn.wyona.com/repos/public/0_tools/apache-ant-1.7.1_extras eclipse.settings http://svn.wyona.com/repos/public/0_tools/eclipse-3.settings From hudson at wyona.com Tue Sep 29 16:18:29 2009 From: hudson at wyona.com (hudson@wyona.com) Date: Tue Sep 29 16:53:23 2009 Subject: [Yanel-commits] Build failed in Hudson: Yanel-trunk #410 In-Reply-To: <2977372.5791254231483947.JavaMail.guillaume@wc-13.wyona.com> References: <2977372.5791254231483947.JavaMail.guillaume@wc-13.wyona.com> Message-ID: <14026828.5861254233909658.JavaMail.guillaume@wc-13.wyona.com> See http://195.226.6.72:8080/job/Yanel-trunk/410/changes Changes: [Guillaume] Ooops, I broke Yanel's build system in r44911! :/ [Guillaume] Now using a more generic Ant project name to avoid accidental duplicate names on import. ------------------------------------------ [...truncated 2092 lines...] [echo] YANEL_HOME is set to: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy dependencies: [artifact:dependencies] There were no dependencies specified init: [echo] Initialize build [echo] Resource Home Directory: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/contributions/resources/resource-creator copy-dependencies: dependencies: [artifact:dependencies] There were no dependencies specified init: [echo] Initialize build [echo] Resource Home Directory: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/contributions/resources/davcollection copy-dependencies: dependencies: init: [echo] Initialize build [echo] Resource Home Directory: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/contributions/resources/pdf copy-dependencies: [copy] Copying 4 files to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/build/webapps/yanel/WEB-INF/lib dependencies: init: copy-dependencies: dependencies: init: [echo] Initialize build [echo] Resource Home Directory: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/contributions/resources/redirect copy-dependencies: dependencies: [artifact:dependencies] There were no dependencies specified init: copy-dependencies: [echo] WARN: No 'src' attribute specified (package: org.wyona.yanel.impl.resources.example) [echo] YANEL_HOME is set to: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy dependencies: [artifact:dependencies] There were no dependencies specified init: [echo] Initialize build [echo] Resource Home Directory: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/realms/welcome-admin/yanel/resources/show-realms copy-dependencies: dependencies: [artifact:dependencies] There were no dependencies specified init: yanel-resource-type.copy-dependencies: copy-dependencies: [copy] Copying 2 files to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/build/webapps/yanel/WEB-INF/classes init: [echo] INFO: Building with Apache Ant version 1.7.1 compiled on June 27 2008 and Java version 1.5 [echo] Yanel Home Dir: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/../../ generate-realms-build: init: [echo] INFO: Building with Apache Ant version 1.7.1 compiled on June 27 2008 and Java version 1.5 [echo] Yanel Home Dir: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/../../ generate-realms-build-from-default: init: [echo] INFO: Building with Apache Ant version 1.7.1 compiled on June 27 2008 and Java version 1.5 [echo] Yanel Home Dir: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/../../ generate-realms-build-from-local: deploy-libs-of-realms: init: [echo] Init ... deploy-realms: init: [echo] Init ... deploy-realm-with-id-javadoc: init: [echo] Init ... deploy-realm-with-id-yanel-website: [copy] Copying 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/build/webapps/yanel/WEB-INF/lib init: [echo] Init ... deploy-realm-with-id-test-cases: init: [echo] Init ... deploy-realm-with-id-test: init: [echo] Init ... deploy-realm-with-id-from-scratch-realm-template: init: [echo] Init ... deploy-realm-with-id-welcome: [copy] Copying 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/build/webapps/yanel/WEB-INF/lib init: [echo] INFO: Building with Apache Ant version 1.7.1 compiled on June 27 2008 and Java version 1.5 [echo] Yanel Home Dir: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/../../ remove-ambiguous-libs: [echo] INFO: Remove ambiguous libs (http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/build/webapps/yanel/WEB-INF/lib/) : commons-lang-2.1.jar,icu4j-2.6.1.jar,xalan-2.6.0.jar,xml-apis-1.0.b2.jar,xml-apis-1.3.02.jar,xercesImpl-2.6.2.jar, xercesImpl-2.7.1.jar deploy: deploy-to-tomcat-cluster-node1: [echo] Copy webapp (http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/webapps) : init: [echo] INFO: Building with Apache Ant version 1.7.1 compiled on June 27 2008 and Java version 1.5 [echo] Yanel Home Dir: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/../../ copy-webapp-files-to-tomcat-cluster-node1: [copy] Copying 838 files to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/webapps/yanel [copy] Copied 109 empty directories to 1 empty directory under http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/webapps/yanel [touch] Creating http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/build/logs/log4j-cnode1.log patch-tomcat-cluster-node-1-ssl-port: ask-to-copy-endorsed-stax-api-to-node1: [echo] IMPORTANT: Please note that your Tomcat might already contain an endorsed stax-api library at 'http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/common/endorsed/'. Please make sure to resolve any conflicts! [input] skipping input as property answer has already been set. do-copy-endorsed-stax-api-to-node1: [copy] Copying 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/common/endorsed [echo] INFO: stax-api-1.0.jar has been copied! ask-to-copy-endorsed-stax-impl-to-node1: [echo] IMPORTANT: Please note that your Tomcat might already contain an endorsed stax-impl library at 'http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/common/endorsed/'. Please make sure to resolve any conflicts! [input] skipping input as property answer has already been set. do-copy-endorsed-stax-impl-to-node1: [copy] Copying 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/common/endorsed [echo] INFO: stax-1.1.2-dev.jar has been copied! deploy-to-tomcat-cluster-node2: final-message: [echo] [echo] [echo] ***************************************************************** [echo] * [echo] * You have successfully built Yanel 1.0-dev (Revision REVISION) [echo] * [echo] * [echo] * Start using Yanel by typing [echo] * [echo] * Tomcat: ./yanel.sh start [echo] * [echo] * and browse to [echo] * [echo] * http://127.0.0.1:8080/yanel/ [echo] * [echo] * [echo] * Thanks for using Yanel [echo] * [echo] ***************************************************************** BUILD SUCCESSFUL Total time: 4 minutes 17 seconds + tools/apache-ant/bin/ant -f tools/apache-tomcat/build.xml configure-host -Dtomcat.home.dir=../../local/apache-tomcat-5.5.20 -Dhost=localhost -Dhost.HTTP.port=8180 -Dhost.HTTPS.port=8543 -Dhost.SHUTDOWN.port=8105 -Dhost.AJP.port=8109 Buildfile: tools/apache-tomcat/build.xml configure-host: [copy] Copying 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/conf [move] Moving 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/conf [move] Moving 1 file to http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/conf BUILD SUCCESSFUL Total time: 1 second + ./yanel.sh start Apache Ant version 1.7.1 compiled on June 27 2008 INFO: Starting Yanel... Buildfile: src/build/build.xml start-tomcat: startup-tomcat-windows: startup-tomcat-unix: startup-tomcat-unix-node1: [echo] Starting Tomcat (http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/local/apache-tomcat-5.5.20/bin/startup.sh) ... startup-tomcat-unix-node2: [echo] ***************************************************************** [echo] * [echo] * You have successfully started Yanel 1.0-dev (Revision REVISION) [echo] * [echo] * [echo] * Start your Browser and visit [echo] * [echo] * http://127.0.0.1:8080/yanel/ [echo] * [echo] * Thanks for using Yanel [echo] * [echo] ***************************************************************** delete-building-hint: BUILD SUCCESSFUL Total time: 3 seconds + cat + ./build.sh test -Dwebtest.home.dir=/opt/canoo/webtest-3.0-R_1758 -Dwebtest.config.host=localhost -Dwebtest.config.protocol=http -Dwebtest.config.port=8180 -Dheadless= Apache Ant version 1.7.1 compiled on June 27 2008 INFO: Building Yanel... Buildfile: src/build/build.xml test: BUILD FAILED http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/test.xml :5: The following error occurred while executing this line: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/test/build.xml :28: The following error occurred while executing this line: http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml :5: Cannot find ${yanel.source.home}/tools/apache-ant_extras/artifacts.build.xml imported from http://195.226.6.72:8080/job/Yanel-trunk/ws/yanel-trunk.working-copy/src/build/targets/build-artifacts.build.xml Total time: 1 second Recording test results From guillaume at wyona.com Tue Sep 29 16:53:29 2009 From: guillaume at wyona.com (guillaume@wyona.com) Date: Tue Sep 29 17:28:55 2009 Subject: [Yanel-commits] rev 44921 - in public/yanel/trunk/src: build test Message-ID: <200909291453.n8TErTS3008379@cvs-extra.wyona.com> Author: guillaume Date: 2009-09-29 16:53:28 +0200 (Tue, 29 Sep 2009) New Revision: 44921 Added: public/yanel/trunk/src/test/pom.xml Removed: public/yanel/trunk/src/build/pom-test.xml Modified: public/yanel/trunk/src/test/build.xml Log: Ooops, I indeed broke Yanel's build system in r44911, but it was only the test subpart of it! To fix it it was simpler to use the Yanel-independant scripts to build Yanel's test Maven artifact, so this is now also done! :) Deleted: public/yanel/trunk/src/build/pom-test.xml =================================================================== --- public/yanel/trunk/src/build/pom-test.xml 2009-09-29 14:23:21 UTC (rev 44920) +++ public/yanel/trunk/src/build/pom-test.xml 2009-09-29 14:53:28 UTC (rev 44921) @@ -1,16 +0,0 @@ - - - - 4.0.0 - wyona-org-yanel - yanel-test - @VERSION@ - - - wyona-org-yanel - yanel-impl - @VERSION@ - - - - Modified: public/yanel/trunk/src/test/build.xml =================================================================== --- public/yanel/trunk/src/test/build.xml 2009-09-29 14:23:21 UTC (rev 44920) +++ public/yanel/trunk/src/test/build.xml 2009-09-29 14:53:28 UTC (rev 44921) @@ -1,6 +1,6 @@ @@ -25,7 +25,7 @@ - + @@ -109,7 +109,10 @@ - @@ -117,7 +120,7 @@ - + Copied: public/yanel/trunk/src/test/pom.xml (from rev 44916, public/yanel/trunk/src/build/pom-test.xml) =================================================================== --- public/yanel/trunk/src/test/pom.xml (rev 0) +++ public/yanel/trunk/src/test/pom.xml 2009-09-29 14:53:28 UTC (rev 44921) @@ -0,0 +1,16 @@ + + + + 4.0.0 + wyona-org-yanel + yanel-test + @VERSION@ + + + wyona-org-yanel + yanel-impl + @VERSION@ + + + + Property changes on: public/yanel/trunk/src/test/pom.xml ___________________________________________________________________ Name: svn:mergeinfo + From hudson at wyona.com Tue Sep 29 17:11:49 2009 From: hudson at wyona.com (hudson@wyona.com) Date: Tue Sep 29 17:46:46 2009 Subject: [Yanel-commits] Hudson build is back to normal: Yanel-trunk #411 In-Reply-To: <14026828.5861254233909658.JavaMail.guillaume@wc-13.wyona.com> References: <14026828.5861254233909658.JavaMail.guillaume@wc-13.wyona.com> Message-ID: <24595939.5921254237109666.JavaMail.guillaume@wc-13.wyona.com> See http://195.226.6.72:8080/job/Yanel-trunk/411/changes