Configure Catalina start

git-svn-id: https://svn.argeo.org/commons/trunk@5947 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/modules/org.argeo.server.catalina.start/.project b/server/modules/org.argeo.server.catalina.start/.project
index f35073dde04f0f0e47994516713cc4165d99008c..25f3507c08add1bbe17aabe6f547a07d7cf3fb75 100644 (file)
--- a/server/modules/org.argeo.server.catalina.start/.project
+++ b/server/modules/org.argeo.server.catalina.start/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>org.argeo.dep.osgi.catalina.start</name>
+       <name>org.argeo.server.catalina.start</name>
        <comment></comment>
        <buildSpec>
                <buildCommand>

diff --git a/server/modules/org.argeo.server.catalina.start/pom.xml b/server/modules/org.argeo.server.catalina.start/pom.xml
index d0455870ee1df93b1581030eb63967aa54ddbfc0..7a405ebba23cd40be66e95db3a76586f3ac7721f 100644 (file)
--- a/server/modules/org.argeo.server.catalina.start/pom.xml
+++ b/server/modules/org.argeo.server.catalina.start/pom.xml
@@ -1,28 +1,24 @@
 <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>
-       <groupId>org.argeo.dep.osgi</groupId>
-       <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-       <name>Catalina starter provided by Spring DM</name>
-       <version>1.0.0.0009</version>
-       <packaging>jar</packaging>
-       <properties></properties>
+       <parent>
+               <groupId>org.argeo.commons.server</groupId>
+               <version>1.1.9-SNAPSHOT</version>
+               <artifactId>modules</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.server.catalina.start</artifactId>
+       <name>Commons Catalina starter</name>
+       <description>Catalina starter hacked from Spring DM sandbox</description>
        <build>
                <plugins>
                        <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
                                <configuration>
-                                       <source>1.5</source>
-                                       <target>1.5</target>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
+                                       <instructions>
+                                               <Bundle-Activator>org.argeo.dep.osgi.catalina.start.CatalinaActivator</Bundle-Activator>
+                                       </instructions>
                                </configuration>
                        </plugin>
                </plugins>
@@ -31,59 +27,18 @@
                <dependency>
                        <groupId>org.eclipse.osgi</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
-                       <version>3.5.1.R35x_v20090827</version>
                </dependency>
                <dependency>
-                       <groupId>org.apache.catalina</groupId>
-                       <artifactId>com.springsource.org.apache.catalina</artifactId>
-                       <version>6.0.24</version>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.catalina</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.logging</artifactId>
-                       <version>1.1.1</version>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.logging</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.io</artifactId>
-                       <version>1.4.0</version>
+                       <groupId>org.argeo.tp</groupId>
+                       <artifactId>org.apache.commons.io</artifactId>
                </dependency>
        </dependencies>
-       <repositories>
-               <repository>
-                       <id>com.springsource.repository.bundles.external</id>
-                       <name>
-                               SpringSource Enterprise Bundle Repository - External
-                               Bundle
-                               Releases
-                       </name>
-                       <url>
-                               http://repository.springsource.com/maven/bundles/external
-                       </url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </repository>
-       </repositories>
-       <distributionManagement>
-               <repository>
-                       <uniqueVersion>false</uniqueVersion>
-                       <id>argeo-restricted</id>
-                       <name>Argeo FOSS Repository</name>
-                       <url>file:///srv/maven/www/argeo</url>
-               </repository>
-               <snapshotRepository>
-                       <uniqueVersion>true</uniqueVersion>
-                       <id>argeo-snapshots-restricted</id>
-                       <name>Argeo FOSS Snapshots Repository</name>
-                       <url>file:///srv/maven/www/argeo-snapshots</url>
-               </snapshotRepository>
-       </distributionManagement>
 </project>