svn commit: r161348 - lenya/sandbox/jcrsitetree/build.xml

[mi...@apache.org]

Author: michi
Date: Thu Apr 14 13:05:34 2005
New Revision: 161348

URL: http://svn.apache.org/viewcvs?view=rev&rev=161348
Log:
thanks to Felix the classpath is set correctly such that flowscript works properly

Modified:
    lenya/sandbox/jcrsitetree/build.xml

Modified: lenya/sandbox/jcrsitetree/build.xml
URL: http://svn.apache.org/viewcvs/lenya/sandbox/jcrsitetree/build.xml?view=diff&r1=161347&r2=161348
==============================================================================
--- lenya/sandbox/jcrsitetree/build.xml (original)
+++ lenya/sandbox/jcrsitetree/build.xml Thu Apr 14 13:05:34 2005
@@ -12,20 +12,24 @@
     <property file="local.build.properties"/>
     <property file="build.properties"/>
 
-    <property name="webapp.dir" value="${lenya.source.dir}/build/lenya/webapp"/>
+    <property name="lenya.webapp.dir" value="${lenya.source.dir}/build/lenya/webapp"/>
+    <property name="jaas.config" value="${lenya.webapp.dir}/lenya/repository/jaas.config"/>
+    <property name="lenya.lib.dir" value="${lenya.webapp.dir}/WEB-INF/lib"/>
+    <property name="lenya.endorsed.dir" value="${lenya.lib.dir}/endorsed"/>
+    <property name="jetty.loader.lib" value="${lenya.source.dir}/tools/loader"/>
 
-    <property name="jaas.config" value="-Djava.security.auth.login.config==${webapp.dir}/lenya/repository/jaas.config"/>
-
-    <property environment="env"/>
-    
     <path id="classpath">
-      <fileset dir="${lenya.source.dir}/build/lenya/webapp/WEB-INF/lib">
+      <fileset dir="${lenya.lib.dir}">
         <include name="*.jar"/>
       </fileset>
 
       <pathelement path="${lenya.source.dir}/build/lenya/webapp/WEB-INF/classes"/>
-      <pathelement path="${env.JAVA_HOME}/jre/lib/rt.jar"/>
-      <pathelement path="${lenya.source.dir}/tools/loader"/>
+      <pathelement path="${java.home}/jre/lib/rt.jar"/>
+    </path>
+
+    <path id="jetty-cp">
+      <pathelement path="${jetty.loader.lib}"/>
+      <pathelement path="${java.home}/jre/lib/rt.jar"/>
     </path>
 
     <echo>Apache Lenya source Dir: ${lenya.source.dir}</echo>
@@ -75,32 +79,33 @@
   </target>
 
   <target name="import-sitetree" depends="init" description="Import sitetree of publications">
-    <echo>Import sitetree from ${webapp.dir}</echo>
+    <echo>Import sitetree from ${lenya.webapp.dir}</echo>
 
     <java classname="org.apache.lenya.cms.publication.ImportSiteTree" fork="true">
-      <arg value="${webapp.dir}"/>
-      <jvmarg value="${jaas.config}"/>
+      <arg value="${lenya.webapp.dir}"/>
+      <jvmarg value="-Djava.security.auth.login.config==${jaas.config}"/>
+      <jvmarg value="-Djava.endorsed.dirs=${lenya.endorsed.dir}"/>
       <classpath refid="classpath"/>
     </java>
   </target>
 
   <target name="clear-repository" depends="init" description="Clear Repository Workspaces">
-    <echo>Clearing workspaces of repository at ${webapp.dir}</echo>
+    <echo>Clearing workspaces of repository at ${lenya.webapp.dir}</echo>
 
     <java classname="org.apache.lenya.cms.publication.ClearRepository" fork="true">
-      <arg value="${webapp.dir}"/>
-      <jvmarg value="${jaas.config}"/>
+      <arg value="${lenya.webapp.dir}"/>
+      <jvmarg value="-Djava.security.auth.login.config==${jaas.config}"/>
       <classpath refid="classpath"/>
     </java>
   </target>
 
   <target name="view-workspace" depends="init" description="View Workspace">
-    <echo>Dumping workspace for repository at ${webapp.dir}</echo>
+    <echo>Dumping workspace for repository at ${lenya.webapp.dir}</echo>
 
     <java classname="org.apache.lenya.cms.publication.ViewRepository" fork="true">
-      <arg value="${webapp.dir}"/>
+      <arg value="${lenya.webapp.dir}"/>
       <arg value="${workspace.name}"/>
-      <jvmarg value="${jaas.config}"/>
+      <jvmarg value="-Djava.security.auth.login.config==${jaas.config}"/>
       <classpath refid="classpath"/>
     </java>
   </target>
@@ -109,15 +114,15 @@
     <echo>Starting Jetty</echo>
     <java classname="Loader" fork="true">
       <arg value="${lenya.source.dir}/tools/jetty/conf/main.xml"/>
-      <jvmarg value="${jaas.config}"/>
-      <jvmarg value="-Djava.endorsed.dirs=${lenya.source.dir}/lib/endorsed"/>
+      <jvmarg value="-Djava.security.auth.login.config==${jaas.config}"/>
+      <jvmarg value="-Djava.endorsed.dirs=${lenya.endorsed.dir}"/>
       <jvmarg value="-Djetty.port=8888"/>
       <jvmarg value="-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser"/>
-      <jvmarg value="-Dloader.jar.repositories=${lenya.source.dir}/tools/jetty/lib:${lenya.source.dir}/lib/endorsed"/>
-      <jvmarg value="-Dwebapp=${lenya.source.dir}/build/lenya/webapp"/>
+      <jvmarg value="-Dloader.jar.repositories=${lenya.source.dir}/tools/jetty/lib:${lenya.endorsed.dir}"/>
+      <jvmarg value="-Dwebapp=${lenya.webapp.dir}"/>
       <jvmarg value="-Dhome=${lenya.source.dir}"/>
       <jvmarg value="-Dloader.main.class=org.mortbay.jetty.Server"/>
-      <classpath refid="classpath"/>
+      <classpath refid="jetty-cp"/>
     </java>
   </target>
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org