[Jboss-svn-commits] JBL Code SVN: r1452 - in trunk/labs/jbossweb: . jboss src/share/classes/org/jboss/web/rewrite

[<jbo...@li...>]

Author: rem...@jb...
Date: 2005-10-26 09:47:50 -0400 (Wed, 26 Oct 2005)
New Revision: 1452

Modified:
   trunk/labs/jbossweb/build.properties.default
   trunk/labs/jbossweb/build.xml
   trunk/labs/jbossweb/jboss/readme.txt
   trunk/labs/jbossweb/src/share/classes/org/jboss/web/rewrite/RewriteTestCase.java
Log:
- Change the place where the JBoss binary should be put. Autodownload is 
  possible, but would take a while (not for me, but ...).
- Build the rewrite component.

Modified: trunk/labs/jbossweb/build.properties.default
===================================================================
--- trunk/labs/jbossweb/build.properties.default	2005-10-26 12:47:08 UTC (rev 1451)
+++ trunk/labs/jbossweb/build.properties.default	2005-10-26 13:47:50 UTC (rev 1452)
@@ -12,10 +12,8 @@
 # ----- Vesion Control Flags -----
 version.major=4
 version.minor=0
-version.build=0
-version.patch=0
-#Set the pretty version name
-version=4.0.0-dev
+version.build=3
+version.patch=SP1
 
 # ----- Compile Control Flags -----
 compile.debug=on

Modified: trunk/labs/jbossweb/build.xml
===================================================================
--- trunk/labs/jbossweb/build.xml	2005-10-26 12:47:08 UTC (rev 1451)
+++ trunk/labs/jbossweb/build.xml	2005-10-26 13:47:50 UTC (rev 1452)
@@ -16,9 +16,8 @@
   <property name="version.major"         value="4" />
   <property name="version.minor"         value="0" />
   <property name="version.build"         value="0" />
-  <property name="version.patch"         value="0" />  
-  <property name="version"               value="4.0.0-dev" />
-  <property name="version.number"        value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
+  <property name="version.patch"         value="" />
+  <property name="version"               value="${version.major}.${version.minor}.${version.build}${version.patch}" />
 
   <property name="project"               value="jbossweb" />
   <property name="final.name"            value="${project}-${version}" />
@@ -30,7 +29,7 @@
            value="${basedir}/.."/>
 
   <!-- Build Defaults -->
-  <property name="jboss.build"        value="${basedir}/jboss"/>
+  <property name="jboss.build"        value="${basedir}/jboss/jboss-${version}"/>
   <property name="jbossweb.build"     value="${basedir}/output"/>
   <property name="jbossweb.release"   value="${basedir}/release"/>
   
@@ -41,7 +40,18 @@
   <property name="compile.deprecation"  value="false" />
   <property name="compile.source"       value="1.4" />
   
-  
+  <path id="catalina.classpath">
+    <fileset dir="${jboss.build}/server/all">
+      <include name="deploy/jbossweb-tomcat55.sar/**"/>
+      <include name="lib/commons-logging.jar" />
+      <include name="lib/javax.servlet.jar" />
+      <include name="lib/javax.servlet.jsp.jar" />
+    </fileset>
+    <fileset dir="${jboss.build}/lib">
+      <include name="jboss-jmx.jar" />
+    </fileset>
+  </path>
+
   <!-- ===================== DEPLOY: Create Directories =================== -->
   <target name="init">
 
@@ -112,6 +122,27 @@
 
   <target name="deploy" depends="deploy-static">
   
+    <mkdir dir="${jbossweb.build}/classes" />
+
+    <javac srcdir="src/share/classes" destdir="${jbossweb.build}/classes"
+           debug="${compile.debug}"
+           deprecation="${compile.deprecation}"
+           source="${compile.source}"
+           optimize="${compile.optimize}"
+           excludes="**/CVS/**">
+      <classpath refid="catalina.classpath" />
+      <exclude name="**/*TestCase.java" />
+    </javac>
+
+    <jar jarfile="${jbossweb.build}/${final.name}/server/default/deploy/jbossweb-tomcat55.sar/catalina-rewrite.jar" index="true">
+      <fileset dir="${jbossweb.build}/classes">
+        <include name="org/jboss/web/rewrite/**"/>
+        <!-- Javadoc and i18n exclusions -->
+        <exclude name="**/package.html" />
+        <exclude name="**/LocalStrings_*" />
+     </fileset>
+    </jar>
+
   </target>
   
   <target name="clean">

Modified: trunk/labs/jbossweb/jboss/readme.txt
===================================================================
--- trunk/labs/jbossweb/jboss/readme.txt	2005-10-26 12:47:08 UTC (rev 1451)
+++ trunk/labs/jbossweb/jboss/readme.txt	2005-10-26 13:47:50 UTC (rev 1452)
@@ -1 +1,2 @@
-Place here a JBoss 4.0.2 binary distribution.
\ No newline at end of file
+Expand here the required JBoss 4.0.x binary distribution (as defined in the 
+build.properties.default file or overridden in the build.properties file).
\ No newline at end of file

Modified: trunk/labs/jbossweb/src/share/classes/org/jboss/web/rewrite/RewriteTestCase.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/jboss/web/rewrite/RewriteTestCase.java	2005-10-26 12:47:08 UTC (rev 1451)
+++ trunk/labs/jbossweb/src/share/classes/org/jboss/web/rewrite/RewriteTestCase.java	2005-10-26 13:47:50 UTC (rev 1452)
@@ -8,17 +8,14 @@
 
     protected class TestResolver extends Resolver {
 
-        @Override
         public String resolve(String key) {
             return "server_variable_value[" + key + "]";
         }
 
-        @Override
         public String resolveHttp(String key) {
             return "http_header_value[" + key + "]";
         }
 
-        @Override
         public String resolveSsl(String key) {
             return "ssl_property_value[" + key + "]";
         }