abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eli...@apache.org
Subject svn commit: r415730 - in /incubator/abdera/java: branches/snell_sandbox/server/src/main/java/org/apache/abdera/server/servlet/ trunk/build/ trunk/dependencies/ trunk/server/src/main/java/org/apache/abdera/server/
Date Tue, 20 Jun 2006 16:55:08 GMT
Author: eliast
Date: Tue Jun 20 09:55:07 2006
New Revision: 415730

URL: http://svn.apache.org/viewvc?rev=415730&view=rev
Log:
- Moved draft server interfaces and servlet implementation to trunk
- Updated the build.xml to build server.jar
- Added a dependency on geronimo-spec-servlet in deps.properties
- Added a geronimo-spec-servlet license (just copied another geronimo license in the dir)
- Removed placeholder.


Removed:
    incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/server/Placeholder
Modified:
    incubator/abdera/java/branches/snell_sandbox/server/src/main/java/org/apache/abdera/server/servlet/ServletRequestContext.java
    incubator/abdera/java/trunk/build/build.xml
    incubator/abdera/java/trunk/dependencies/deps.properties

Modified: incubator/abdera/java/branches/snell_sandbox/server/src/main/java/org/apache/abdera/server/servlet/ServletRequestContext.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/snell_sandbox/server/src/main/java/org/apache/abdera/server/servlet/ServletRequestContext.java?rev=415730&r1=415729&r2=415730&view=diff
==============================================================================
--- incubator/abdera/java/branches/snell_sandbox/server/src/main/java/org/apache/abdera/server/servlet/ServletRequestContext.java
(original)
+++ incubator/abdera/java/branches/snell_sandbox/server/src/main/java/org/apache/abdera/server/servlet/ServletRequestContext.java
Tue Jun 20 09:55:07 2006
@@ -69,7 +69,11 @@
   
   public URI getPathInfo() {
 	try {
-		return new URI(servletRequest.getPathInfo());
+		String pathInfo = servletRequest.getPathInfo();
+		if(pathInfo == null) {
+			pathInfo = "";
+		}
+		return new URI(pathInfo);
 	} catch (URISyntaxException e) {
 		throw new RuntimeException(e);
 	}

Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=415730&r1=415729&r2=415730&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Tue Jun 20 09:55:07 2006
@@ -29,6 +29,11 @@
   <property name="parser.test.resources" value="${parser}/src/test/resources" />
   <property name="parser.work" value="${work}/parser" />
   <property name="parser.jar" value="${dist}/${ant.project.name}.parser.${version}.jar"
/>
+  <property name="server" value="${basedir}/server" />
+  <property name="server.src" value="${server}/src/main/java" />
+  <property name="server.work" value="${work}/server" />
+  <property name="server.jar" value="${dist}/${ant.project.name}.server.${version}.jar"
/>
+  	
 
   <property name="dependencies" value="${basedir}/dependencies" />
   <property file="${dependencies}/deps.properties" />
@@ -58,6 +63,7 @@
         <and>
           <available file="${dependencies}/${geronimo.activation.jar}" />
           <available file="${dependencies}/${geronimo.javamail.jar}" />
+          <available file="${dependencies}/${geronimo.servlet.jar}" />        	
           <available file="${dependencies}/${axiom.api.jar}" />
           <available file="${dependencies}/${axiom.impl.jar}" />
           <available file="${dependencies}/${jaxen.jar}" />
@@ -108,8 +114,16 @@
   	  </fileset>
   	</copy>
   </target>
+	
+  <target name="compile.server" depends="init, compile.core">
+    <mkdir dir="${server.work}" />
+    <javac srcdir="${server.src}"
+           destdir="${server.work}"
+           classpathref="jar.dependencies"
+           classpath="${core.work}" />
+  </target>	
 
-  <target name="build" depends="init,compile.core,compile.parser"></target>
+  <target name="build" depends="init,compile.core,compile.parser,compile.server"></target>
 
   <target name="docs" depends="init">
     <javadoc packagenames="org.apache.abdera.*"
@@ -144,6 +158,7 @@
     <mkdir dir="${dist_lib}" />
     <jar destfile="${core.jar}"   basedir="${core.work}" />
     <jar destfile="${parser.jar}" basedir="${parser.work}" />
+    <jar destfile="${server.jar}" basedir="${server.work}" />  	
     <copy todir="${dist_lib}">
       <fileset dir="${dependencies}"  />
     </copy>
@@ -169,6 +184,9 @@
       <get src="${geronimo.javamail.dir}/${geronimo.javamail.jar}"
            dest="${dependencies}/${geronimo.javamail.jar}"
            usetimestamp="true" />
+      <get src="${geronimo.servlet.dir}/${geronimo.servlet.jar}"
+             dest="${dependencies}/${geronimo.servlet.jar}"
+             usetimestamp="true" />    	
       <get src="${axiom.dir}/${axiom.api.jar}"
            dest="${dependencies}/${axiom.api.jar}"
            usetimestamp="true" />

Modified: incubator/abdera/java/trunk/dependencies/deps.properties
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/dependencies/deps.properties?rev=415730&r1=415729&r2=415730&view=diff
==============================================================================
--- incubator/abdera/java/trunk/dependencies/deps.properties (original)
+++ incubator/abdera/java/trunk/dependencies/deps.properties Tue Jun 20 09:55:07 2006
@@ -38,6 +38,9 @@
 geronimo.javamail.dir=http://www.apache.org/dist/java-repository/org.apache.geronimo.specs/jars
 geronimo.javamail.jar=geronimo-javamail_1.3.1_spec-1.0.jar
 
+geronimo.servlet.dir=http://www.apache.org/dist/java-repository/org.apache.geronimo.specs/jars
+geronimo.servlet.jar=geronimo-servlet_2.4_spec-1.0.jar
+
 axiom.dir=http://www.apache.org/dist/java-repository/ws-commons/jars
 axiom.api.jar=axiom-api-1.0.jar
 axiom.impl.jar=axiom-impl-1.0.jar



Mime
View raw message