Author: craigmcc
Date: Fri Apr 15 18:53:19 2005
New Revision: 161533

URL: http://svn.apache.org/viewcvs?view=rev&rev=161533
Log:
Change "shale.jar" to "shale-core.jar" so we can also create a combined
JAR later, if appropriate.

Modified:
    struts/shale/trunk/core-library/build.xml
    struts/shale/trunk/test-framework/build.xml
    struts/shale/trunk/use-cases/build.xml

Modified: struts/shale/trunk/core-library/build.xml
URL: 
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?view=diff&r1=161532&r2=161533
==============================================================================
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Fri Apr 15 18:53:19 2005
@@ -276,7 +276,7 @@
   <target         name="library-core" depends="compile"
            description="Package core library">
 
-    <jar       jarfile="${build.home}/lib/shale.jar"
+    <jar       jarfile="${build.home}/lib/shale-core.jar"
                basedir="${build.home}/classes"
               manifest="${build.home}/conf/MANIFEST.MF"
               excludes="org/apache/shale/spring/** **/package.html"/>

Modified: struts/shale/trunk/test-framework/build.xml
URL: 
http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/build.xml?view=diff&r1=161532&r2=161533
==============================================================================
--- struts/shale/trunk/test-framework/build.xml (original)
+++ struts/shale/trunk/test-framework/build.xml Fri Apr 15 18:53:19 2005
@@ -55,7 +55,7 @@
   <property name="jstl.jar"         value="${jstl.home}/lib/jstl.jar"/>
   <property name="junit.jar"        value="${junit.home}/junit.jar"/>
   <property name="servlet-api.jar"  
value="${server.home}/common/lib/servlet.jar"/>
-  <property name="shale.jar"        value="${shale.home}/lib/shale.jar"/>
+  <property name="shale-core.jar"   value="${shale.home}/lib/shale-core.jar"/>
   <property name="standard.jar"     value="${jstl.home}/lib/standard.jar"/>
 
 
@@ -97,7 +97,7 @@
     <pathelement location="${jsp-api.jar}"/>
     <pathelement location="${junit.jar}"/>
     <pathelement location="${servlet-api.jar}"/>
-    <pathelement location="${shale.jar}"/>
+    <pathelement location="${shale-core.jar}"/>
     <pathelement location="${build.home}/classes"/>
   </path>
 
@@ -113,7 +113,7 @@
     <pathelement location="${jsp-api.jar}"/>
     <pathelement location="${junit.jar}"/>
     <pathelement location="${servlet-api.jar}"/>
-    <pathelement location="${shale.jar}"/>
+    <pathelement location="${shale-core.jar}"/>
     <pathelement location="${build.home}/classes"/>
     <pathelement location="${build.home}/test-classes"/>
   </path>
@@ -137,7 +137,7 @@
     <filter  token="version"  value="${project.version}"/>
     <echo  message="jsf-api.jar =    ${jsf-api.jar}"/>
     <echo  message="jsf-impl.jar =   ${jsf-impl.jar}"/>
-    <echo  message="shale-jar =      ${shale.jar}"/>
+    <echo  message="shale-core.jar = ${shale-core.jar}"/>
     <echo  message="jsfri.present =  ${jsfri.present}"/>
     <echo  message="myfaces.present= ${myfaces.present}"/>
   </target>

Modified: struts/shale/trunk/use-cases/build.xml
URL: 
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/build.xml?view=diff&r1=161532&r2=161533
==============================================================================
--- struts/shale/trunk/use-cases/build.xml (original)
+++ struts/shale/trunk/use-cases/build.xml Fri Apr 15 18:53:19 2005
@@ -60,7 +60,7 @@
   <property name="jstl.jar"         value="${jstl.home}/lib/jstl.jar"/>
   <property name="junit.jar"        value="${junit.home}/junit.jar"/>
   <property name="servlet-api.jar"  
value="${server.home}/common/lib/servlet-api.jar"/>
-  <property name="shale.jar"        
value="${basedir}/../core-library/target/lib/shale.jar"/>
+  <property name="shale-core.jar"   
value="${basedir}/../core-library/target/lib/shale-core.jar"/>
   <property name="shale-spring.jar" 
value="${basedir}/../core-library/target/lib/shale-spring.jar"/>
   <property name="shale-test.jar"   
value="${basedir}/../test-framework/target/lib/shale-test.jar"/>
   <property name="spring-beans.jar" 
value="${spring.home}/dist/spring-beans.jar"/>
@@ -113,7 +113,7 @@
     <pathelement location="${jsp-api.jar}"/>
     <pathelement location="${jstl.jar}"/>
     <pathelement location="${servlet-api.jar}"/>
-    <pathelement location="${shale.jar}"/>
+    <pathelement location="${shale-core.jar}"/>
     <pathelement location="${spring-beans.jar}"/>
     <pathelement location="${spring-context.jar}"/>
     <pathelement location="${spring-core.jar}"/>
@@ -134,7 +134,7 @@
     <pathelement location="${jstl.jar}"/>
     <pathelement location="${junit.jar}"/>
     <pathelement location="${servlet-api.jar}"/>
-    <pathelement location="${shale.jar}"/>
+    <pathelement location="${shale-core.jar}"/>
     <pathelement location="${shale-test.jar}"/>
     <pathelement location="${spring-beans.jar}"/>
     <pathelement location="${spring-context.jar}"/>
@@ -193,7 +193,7 @@
     <echo  message="commons-chain.jar =${commons-chain.jar}"/>
     <echo  message="jsf-api.jar =      ${jsf-api.jar}"/>
     <echo  message="jsf-impl.jar =     ${jsf-impl.jar}"/>
-    <echo  message="shale.jar =        ${shale.jar}"/>
+    <echo  message="shale-core.jar =   ${shale-core.jar}"/>
     <echo  message="spring-core.jar =  ${spring-core.jar}"/>
     <echo  message="jsfri.present =    ${jsfri.present}"/>
     <echo  message="myfaces.present =  ${myfaces.present}"/>
@@ -234,7 +234,7 @@
     <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
                   file="${commons-logging.jar}"/>
     <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
-                  file="${shale.jar}"/>
+                  file="${shale-core.jar}"/>
     <copy        todir="${build.home}/${context.path}/WEB-INF/lib"
                   file="${shale-spring.jar}"/>
     <copy        todir="${build.home}/${context.path}/WEB-INF/lib"



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to