You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/01/13 09:50:44 UTC
svn commit: r898685 - in /geronimo/external/trunk/tomcat-archetype: ./
catalina/ jasper-el/ jasper/ util/ util/src/ util/src/main/
util/src/main/java/ util/src/main/java/org/ util/src/main/java/org/apache/
util/src/main/java/org/apache/tomcat/ util/src...
Author: xuhaihong
Date: Wed Jan 13 08:50:43 2010
New Revision: 898685
URL: http://svn.apache.org/viewvc?rev=898685&view=rev
Log:
Still need the util package for sharing util/scan package between jasper and catalina
Added:
geronimo/external/trunk/tomcat-archetype/util/
geronimo/external/trunk/tomcat-archetype/util/pom.xml
geronimo/external/trunk/tomcat-archetype/util/src/
geronimo/external/trunk/tomcat-archetype/util/src/main/
geronimo/external/trunk/tomcat-archetype/util/src/main/java/
geronimo/external/trunk/tomcat-archetype/util/src/main/java/org/
geronimo/external/trunk/tomcat-archetype/util/src/main/java/org/apache/
geronimo/external/trunk/tomcat-archetype/util/src/main/java/org/apache/tomcat/
geronimo/external/trunk/tomcat-archetype/util/src/main/java/org/apache/tomcat/util/
Modified:
geronimo/external/trunk/tomcat-archetype/catalina/pom.xml
geronimo/external/trunk/tomcat-archetype/jasper-el/pom.xml
geronimo/external/trunk/tomcat-archetype/jasper/pom.xml
geronimo/external/trunk/tomcat-archetype/pom.xml
geronimo/external/trunk/tomcat-archetype/svn-actions.sh
Modified: geronimo/external/trunk/tomcat-archetype/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/catalina/pom.xml?rev=898685&r1=898684&r2=898685&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/catalina/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/catalina/pom.xml Wed Jan 13 08:50:43 2010
@@ -66,6 +66,10 @@
<groupId>${groupId}</groupId>
<artifactId>shared</artifactId>
</dependency>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>util</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: geronimo/external/trunk/tomcat-archetype/jasper-el/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/jasper-el/pom.xml?rev=898685&r1=898684&r2=898685&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/jasper-el/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/jasper-el/pom.xml Wed Jan 13 08:50:43 2010
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_1.0_spec</artifactId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
</dependencies>
<build>
Modified: geronimo/external/trunk/tomcat-archetype/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/jasper/pom.xml?rev=898685&r1=898684&r2=898685&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/jasper/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/jasper/pom.xml Wed Jan 13 08:50:43 2010
@@ -36,11 +36,11 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_1.0_spec</artifactId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -74,6 +74,10 @@
<groupId>${groupId}</groupId>
<artifactId>jasper-el</artifactId>
</dependency>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>util</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: geronimo/external/trunk/tomcat-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/pom.xml?rev=898685&r1=898684&r2=898685&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/pom.xml Wed Jan 13 08:50:43 2010
@@ -58,7 +58,7 @@
<!--<module>juli-extras</module>-->
<module>catalina</module>
<module>tribes</module>
- <!--<module>util</module>-->
+ <module>util</module>
<module>catalina-ha</module>
<!--<module>coyote</module>-->
<module>jasper</module>
@@ -80,8 +80,8 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0.1</version>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -100,7 +100,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -190,11 +190,11 @@
<artifactId>tribes</artifactId>
<version>${version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>${groupId}</groupId>-->
- <!--<artifactId>util</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>util</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: geronimo/external/trunk/tomcat-archetype/svn-actions.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/svn-actions.sh?rev=898685&r1=898684&r2=898685&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/svn-actions.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/svn-actions.sh Wed Jan 13 08:50:43 2010
@@ -52,7 +52,7 @@
$SVN_CMD $TOMCAT/java/org/apache/coyote/ catalina/src/main/java/org/apache/coyote
$SVN_CMD $TOMCAT/java/org/apache/tomcat/jni/ catalina/src/main/java/org/apache/tomcat/jni
$SVN_CMD $TOMCAT/java/org/apache/jk/ catalina/src/main/java/org/apache/jk
-$SVN_CMD $TOMCAT/java/org/apache/tomcat/util/ catalina/src/main/java/org/apache/tomcat/util
+$SVN_CMD $TOMCAT/java/org/apache/tomcat/util/net/ catalina/src/main/java/org/apache/tomcat/util/net
#catalina-ha
$SVN_CMD $TOMCAT/java/org/apache/catalina/ha/ catalina-ha/src/main/java/org/apache/catalina/ha
@@ -90,6 +90,10 @@
#tribes
$SVN_CMD $TOMCAT/java/org/apache/catalina/tribes/ tribes/src/main/java/org/apache/catalina/tribes
+#util
+$SVN_CMD $TOMCAT/java/org/apache/tomcat/util/ util/src/main/java/org/apache/tomcat/util
+$RM util/src/main/java/org/apache/tomcat/util/net
+
# move the properties files to src/main/resourcs
find . -name *.properties |xargs -n1 ./mv-resource.sh
Added: geronimo/external/trunk/tomcat-archetype/util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/util/pom.xml?rev=898685&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/util/pom.xml (added)
+++ geronimo/external/trunk/tomcat-archetype/util/pom.xml Wed Jan 13 08:50:43 2010
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>tomcat-parent-7.0.0</artifactId>
+ <version>7.0.0.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>util</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Geronimo Tomcat fork: Util</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>shared</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+