tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Jencks <david_jen...@yahoo.com>
Subject Re: svn commit: r729688 - in /tomcat/trunk: build.xml res/maven/catalina.pom res/maven/jasper.pom res/maven/mvn-pub.xml
Date Sun, 28 Dec 2008 05:13:19 GMT
Since you are putting this in a separate jar, what would you think of  
using a package name appropriate for the tomcat project, since these  
classes are tomcat/jasper specific and not a product of apache as a  
whole?

thanks
david jencks

On Dec 27, 2008, at 2:17 PM, markt@apache.org wrote:

> Author: markt
> Date: Sat Dec 27 14:17:49 2008
> New Revision: 729688
>
> URL: http://svn.apache.org/viewvc?rev=729688&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46344
> Put the org.apache classes in a separate jar
> Maven changes need validating.
>
> Modified:
>    tomcat/trunk/build.xml
>    tomcat/trunk/res/maven/catalina.pom
>    tomcat/trunk/res/maven/jasper.pom
>    tomcat/trunk/res/maven/mvn-pub.xml
>
> Modified: tomcat/trunk/build.xml
> URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=729688&r1=729687&r2=729688&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- tomcat/trunk/build.xml (original)
> +++ tomcat/trunk/build.xml Sat Dec 27 14:17:49 2008
> @@ -73,6 +73,7 @@
>   <property name="catalina-ha.jar" value="${tomcat.build}/lib/ 
> catalina-ha.jar"/>
>   <property name="catalina-ant.jar" value="${tomcat.build}/lib/ 
> catalina-ant.jar"/>
>   <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/ 
> tomcat-coyote.jar"/>
> +  <property name="tomcat-api.jar" value="${tomcat.build}/lib/tomcat- 
> api.jar"/>
>
>   <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/>
>   <property name="jasper-el.jar" value="${tomcat.build}/lib/jasper- 
> el.jar"/>
> @@ -198,8 +199,11 @@
>     <include name="org/apache/juli/**" />
>   </patternset>
>
> -  <patternset id="files.catalina">
> +  <patternset id="files.tomcat-api">
>     <include name="org/apache/*" />
> +  </patternset>
> +  	
> +  <patternset id="files.catalina">
>     <include name="org/apache/catalina/**" />
>     <include name="org/apache/naming/**" />
>     <!-- Modules -->
> @@ -235,7 +239,6 @@
>   </patternset>
>
>   <patternset id="files.jasper">
> -    <include name="org/apache/*" />
>     <include name="org/apache/jasper/**" />
>   </patternset>
>
> @@ -335,12 +338,15 @@
>     <!-- Catalina GroupCom/Tribes JAR File -->
>     <jarIt jarfile="${catalina-tribes.jar}" filesId="files.catalina- 
> tribes"/>
>
> -  <!-- Catalina Cluster/HA JAR File -->
> +    <!-- Catalina Cluster/HA JAR File -->
>     <jarIt jarfile="${catalina-ha.jar}" filesId="files.catalina-ha"/>
>
>     <!-- Catalina Ant Tasks JAR File -->
>     <jarIt jarfile="${catalina-ant.jar}" filesId="files.catalina- 
> ant"/>
>
> +    <!-- Tomcat API JAR File -->
> +    <jarIt jarfile="${tomcat-api.jar}" filesId="files.tomcat-api"/>
> +
>     <!-- Protocol handlers - Coyote -->
>     <jarIt jarfile="${tomcat-coyote.jar}" filesId="files.tomcat- 
> coyote"/>
>
>
> Modified: tomcat/trunk/res/maven/catalina.pom
> URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/catalina.pom?rev=729688&r1=729687&r2=729688&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- tomcat/trunk/res/maven/catalina.pom (original)
> +++ tomcat/trunk/res/maven/catalina.pom Sat Dec 27 14:17:49 2008
> @@ -48,5 +48,11 @@
>       <version>@MAVEN.DEPLOY.VERSION@</version>
>       <scope>compile</scope>
>     </dependency>
> +    <dependency>
> +      <groupId>org.apache.tomcat</groupId>
> +      <artifactId>tomcat-api</artifactId>
> +      <version>@MAVEN.DEPLOY.VERSION@</version>
> +      <scope>compile</scope>
> +    </dependency>
>   </dependencies>
> </project>
>
> Modified: tomcat/trunk/res/maven/jasper.pom
> URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/jasper.pom?rev=729688&r1=729687&r2=729688&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- tomcat/trunk/res/maven/jasper.pom (original)
> +++ tomcat/trunk/res/maven/jasper.pom Sat Dec 27 14:17:49 2008
> @@ -64,5 +64,11 @@
>       <version>@MAVEN.DEPLOY.VERSION@</version>
>       <scope>compile</scope>
>     </dependency>
> +    <dependency>
> +      <groupId>org.apache.tomcat</groupId>
> +      <artifactId>tomcat-api</artifactId>
> +      <version>@MAVEN.DEPLOY.VERSION@</version>
> +      <scope>compile</scope>
> +    </dependency>
>   </dependencies>
> </project>
>
> Modified: tomcat/trunk/res/maven/mvn-pub.xml
> URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=729688&r1=729687&r2=729688&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- tomcat/trunk/res/maven/mvn-pub.xml (original)
> +++ tomcat/trunk/res/maven/mvn-pub.xml Sat Dec 27 14:17:49 2008
> @@ -135,6 +135,7 @@
>     <doMavenDeploy artifactId="servlet-api"/> <!--Deploy Servlet  
> api-->
>     <doMavenDeploy artifactId="el-api"/> <!--Deploy expression  
> lanaguage api-->
>     <doMavenDeploy artifactId="jsp-api"/> <!--Deploy JSP api-->
> +    <doMavenDeploy artifactId="tomcat-api" /> <!--Deploy Tomcat  
> api-->
>     <doMavenDeploy artifactId="juli" jarFileName="tomcat-juli.jar"/>  
> <!--Deploy JULI-->
>     <doMavenDeploy artifactId="tribes" jarFileName="catalina- 
> tribes.jar"/> <!--Deploy Tribes-->
>     <doMavenDeploy artifactId="jasper-el"/> <!--Deploy Jasper EL-->
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message