geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r999289 - /geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml
Date Tue, 21 Sep 2010 09:32:03 GMT
Author: xiaming
Date: Tue Sep 21 09:32:03 2010
New Revision: 999289

URL: http://svn.apache.org/viewvc?rev=999289&view=rev
Log:
GERONIMO-5616 tribes packages dynamically call class in catalina-ha, so add import-package
instructions to tribes

Modified:
    geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml

Modified: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml?rev=999289&r1=999288&r2=999289&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml Tue Sep 21 09:32:03 2010
@@ -28,12 +28,39 @@
     <packaging>bundle</packaging>
 
     <name>Apache Geronimo Tomcat fork: Tribes</name>
+    <properties>
+			<pkgGroupId>${project.groupId}</pkgGroupId>
+			<pkgArtifactId>${project.artifactId}</pkgArtifactId>
+			<pkgVersion>${project.version}</pkgVersion>
+		</properties>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>juli</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <artifactId>catalina-ha</artifactId>
+            <exclusions>
+        			<exclusion>
+            		<groupId>org.apache.geronimo.specs</groupId>
+            		<artifactId>geronimo-servlet_3.0_spec</artifactId>
+        			</exclusion>
+        			<exclusion>
+            		<groupId>org.apache.geronimo.ext.tomcat</groupId>
+            		<artifactId>juli</artifactId>
+        			</exclusion>
+        			<exclusion>
+            		<groupId>org.apache.geronimo.ext.tomcat</groupId>
+            		<artifactId>tribes</artifactId>
+        			</exclusion>
+        			<exclusion>
+            		<groupId>org.apache.geronimo.ext.tomcat</groupId>
+            		<artifactId>catalina</artifactId>
+        			</exclusion>        			
+      			</exclusions>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -41,7 +68,19 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
-                    <instructions />
+                    <instructions>
+											<Import-Package>
+                           org.apache.catalina.ha.authenticator; 
+                           org.apache.catalina.ha.backend; 
+                           org.apache.catalina.ha.context; 
+                           org.apache.catalina.ha.deploy; 
+                           org.apache.catalina.ha.jmx; 
+                           org.apache.catalina.ha.session; 
+                           org.apache.catalina.ha.tcp; 
+                           org.apache.catalina.ha.util;
+                           org.apache.juli.logging*;
+											</Import-Package>
+                    </instructions>
                 </configuration>
             </plugin>
         </plugins>



Mime
View raw message