Improve Maven dependency structure
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 9 Dec 2011 13:56:40 +0000 (13:56 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 9 Dec 2011 13:56:40 +0000 (13:56 +0000)
git-svn-id: https://svn.argeo.org/commons/trunk@4917 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

19 files changed:
basic/runtime/org.argeo.basic.nodeps/pom.xml
basic/runtime/pom.xml
eclipse/features/org.argeo.eclipse.dep.rap/pom.xml
eclipse/features/pom.xml
security/dep/org.argeo.security.dep.ads/pom.xml [deleted file]
security/dep/org.argeo.security.dep.node/pom.xml [deleted file]
security/dep/pom.xml
security/features/org.argeo.security.dep.node.eclipse/META-INF/MANIFEST.MF [new file with mode: 0644]
security/features/org.argeo.security.dep.node.eclipse/p2.inf [new file with mode: 0644]
security/features/org.argeo.security.dep.node.eclipse/pom.xml [new file with mode: 0644]
security/features/org.argeo.security.dep.node.rap/pom.xml
security/features/org.argeo.security.dep.node.rcp/pom.xml
security/features/org.argeo.security.dep.node/p2.inf [new file with mode: 0644]
security/features/org.argeo.security.dep.node/pom.xml [new file with mode: 0644]
security/features/pom.xml
security/modules/pom.xml
security/pom.xml
security/runtime/pom.xml
server/dep/org.argeo.server.dep.tomcat/pom.xml

index e7ca2bdacd2ac8f7a91a60cdb832e666957b736a..00d4ef55261f5ec27062b1be036d7bde3f8df08f 100644 (file)
@@ -13,7 +13,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-
                                <configuration>
                                        <instructions>
                                                <Export-Package>
index f4159c3fd632ca9da0008eafcbfdc08808d2642e..287947b38f29e6ca1286f25970ddf335a492d3bf 100644 (file)
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <manifestLocation>META-INF</manifestLocation>
-                                       <instructions>
-                                               <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
-                                               <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                                               <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
-                                               <_removeheaders>Bnd-LastModified</_removeheaders>
-                                       </instructions>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>bundle-manifest</id>
-                                               <phase>process-classes</phase>
-                                               <goals>
-                                                       <goal>manifest</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
                        </plugin>
                </plugins>
        </build>
index fcd6a56a3453e4fc2c648b889b4b88bb4885b92c..41ef4a0bc16a12a6150518a8fe02261755f8e06f 100644 (file)
@@ -9,6 +9,9 @@
        </parent>
        <artifactId>org.argeo.eclipse.dep.rap</artifactId>
        <name>Commons Eclipse RAP Dependencies</name>
+       <properties>
+               <version.rap>1.3.2</version.rap>
+       </properties>
        <build>
                <plugins>
                        <plugin>
                </dependency>
 
                <!-- RAP Specific Dependencies -->
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.ui</artifactId>
-               </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
                        <artifactId>com.springsource.javax.servlet</artifactId>
                </dependency>
 
                <!-- RAP -->
-               <!-- Order is important -->
+               <!-- order IS important -->
+               <dependency>
+                       <groupId>org.eclipse.rap</groupId>
+                       <artifactId>org.eclipse.rap.ui</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.eclipse.rap</groupId>
                        <artifactId>org.eclipse.rap.rwt</artifactId>
                        <groupId>org.eclipse.rap</groupId>
                        <artifactId>org.eclipse.rap.ui.workbench</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.eclipse.rap</groupId>
-                       <artifactId>org.eclipse.rap.ui</artifactId>
-               </dependency>
 
                <!-- Jetty (TO BE REMOVED and replaced by Tomcat
                <dependency>
                        <artifactId>org.eclipse.core.databinding.beans</artifactId>
                </dependency>
        </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+<!--                                   <plugin> -->
+<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
+<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
+<!--                                           <executions> -->
+<!--                                                   <execution> -->
+<!--                                                           <id>copy-rap</id> -->
+<!--                                                           <phase>package</phase> -->
+<!--                                                           <goals> -->
+<!--                                                                   <goal>copy-dependencies</goal> -->
+<!--                                                           </goals> -->
+<!--                                                           <configuration> -->
+<!--                                                                   <includeTypes>jar</includeTypes> -->
+<!--                                                                   <includeGroupIds>org.eclipse.core,org.eclipse.equinox,org.eclipse.rap,org.eclipse.help,org.argeo.dep.rap,org.eclipse.osgi,com.ibm.icu</includeGroupIds> -->
+<!--                                                                   <outputDirectory>${project.build.directory}/eclipse-rap</outputDirectory> -->
+<!--                                                           </configuration> -->
+<!--                                                   </execution> -->
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-rap</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>eclipse-rap</name>
+                                                                       <projversion>${version.rap}</projversion>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/eclipse-rap</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <dependency/>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>
index 9f00461708675ea1c0f46e2a1926fc36eba2f455..cfacd08279993cb2d1b0b406d29d54db5c0ca027 100644 (file)
                        </plugin>
                        <plugin>
                                <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-
-                               <configuration>
-                                       <manifestLocation>META-INF</manifestLocation>
-                               </configuration>
                        </plugin>
                </plugins>
                <pluginManagement>
diff --git a/security/dep/org.argeo.security.dep.ads/pom.xml b/security/dep/org.argeo.security.dep.ads/pom.xml
deleted file mode 100644 (file)
index c2691c1..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<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.argeo.commons.security</groupId>
-               <version>0.3.4-SNAPSHOT</version>
-               <artifactId>dep</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.security.dep.ads</artifactId>
-       <packaging>pom</packaging>
-       <name>Commons Security ADS Dependencies</name>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.dep.ads</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-
-
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.ads.server</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.ads</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.basic</groupId>
-                       <artifactId>org.argeo.basic.dep.log4j</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-               <dependency>
-                       <groupId>net.sourceforge.jdbm</groupId>
-                       <artifactId>com.springsource.jdbm</artifactId>
-               </dependency>
-
-               <!-- TODO remove it? -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.json</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-       </dependencies>
-</project>
\ No newline at end of file
diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
deleted file mode 100644 (file)
index 0c44338..0000000
+++ /dev/null
@@ -1,384 +0,0 @@
-<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.argeo.commons.security</groupId>
-               <version>0.3.4-SNAPSHOT</version>
-               <artifactId>dep</artifactId>
-               <relativePath>..</relativePath>
-       </parent>
-       <artifactId>org.argeo.security.dep.node</artifactId>
-       <name>Commons Node Dependencies</name>
-       <packaging>pom</packaging>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <version>${version.maven-argeo-osgi}</version>
-                               <executions>
-                                       <execution>
-                                               <id>check-osgi</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>equinox</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <onlyCheck>true</onlyCheck>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <!-- Base runtime -->
-               <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
-                       <artifactId>org.argeo.osgi.dep.stdruntime</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-
-               <!-- Argeo Security -->
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.core</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.mvc</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Xerces and Xalan -->
-               <dependency>
-                       <groupId>org.apache.xmlcommons</groupId>
-                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.xalan</groupId>
-                       <artifactId>com.springsource.org.apache.xalan</artifactId>
-               </dependency>
-
-               <!-- Spring -->
-               <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.extender</artifactId>
-               </dependency>
-
-               <!-- Jackrabbit -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.jackrabbit</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.jackrabbit</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.node.repo.jackrabbit</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Active MQ -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.dep.activemq</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.activemq</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.activemq.broker</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Javax -->
-               <dependency>
-                       <groupId>javax.xml.soap</groupId>
-                       <artifactId>com.springsource.javax.xml.soap</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.activation</groupId>
-                       <artifactId>com.springsource.javax.activation</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.annotation</groupId>
-                       <artifactId>com.springsource.javax.annotation</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.ws</groupId>
-                       <artifactId>com.springsource.javax.xml.ws</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>com.springsource.javax.xml.bind</artifactId>
-               </dependency>
-
-               <!-- Commons -->
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.vfs</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.commons.exec</artifactId>
-               </dependency>
-
-               <!-- Security (LDAP) -->
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.dao.ldap</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.ldap</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Security (Jackrabbit) -->
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.dao.jackrabbit</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Security (Standalone) -->
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.dao.os</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Web -->
-               <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.web.extender</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.web</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.dep.tomcat</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.webextender</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.jcr.mvc</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.jackrabbit.webapp</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Default Tomcat conf -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.tomcat</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-               <!-- LDAP server -->
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.dep.ads</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-
-               <!-- Hibernate -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.server.dep.hibernate</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-                       <type>pom</type>
-               </dependency>
-
-               <!-- DB drivers -->
-               <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>com.springsource.org.h2</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>com.mysql.jdbc</groupId>
-                       <artifactId>com.springsource.com.mysql.jdbc</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.postgresql</groupId>
-                       <artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
-               </dependency>
-
-               <!-- Software development -->
-               <dependency>
-                       <groupId>org.argeo.commons.basic</groupId>
-                       <artifactId>org.argeo.support.junit</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-       </dependencies>
-       <profiles>
-               <profile>
-                       <id>rpmbuild</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>copy-node</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>copy-dependencies</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeGroupIds>org.argeo.commons.basic,org.argeo.commons.osgi,org.argeo.commons.server,org.argeo.commons.security</includeGroupIds>
-                                                                       <excludeArtifactIds>org.argeo.osgi.boot</excludeArtifactIds>
-                                                                       <outputDirectory>${project.build.directory}/node</outputDirectory>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                                       <plugin>
-                                               <groupId>org.codehaus.mojo</groupId>
-                                               <artifactId>rpm-maven-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>rpm-node</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>argeo-node</name>
-                                                                       <copyright>2011 Argeo</copyright>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/osgi</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>${project.build.directory}/node</location>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                                       <requires>
-                                                                               <require>argeo-node-tp</require>
-                                                                       </requires>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                                       <plugin>
-                                               <artifactId>maven-antrun-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <phase>install</phase>
-                                                               <goals>
-                                                                       <goal>run</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <target>
-                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
-                                                                                       <fileset dir="${project.build.directory}/rpm"
-                                                                                               includes="*/RPMS/**/*.rpm" />
-                                                                                       <flattenmapper />
-                                                                               </copy>
-                                                                       </target>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-               <profile>
-                       <id>rpmbuild-tp</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>copy-tp</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>copy-dependencies</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <excludeGroupIds>org.argeo.commons.basic,org.argeo.commons.osgi,org.argeo.commons.server,org.argeo.commons.security</excludeGroupIds>
-                                                                       <excludeArtifactIds>org.eclipse.osgi</excludeArtifactIds>
-                                                                       <outputDirectory>${project.build.directory}/node-tp</outputDirectory>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                                       <plugin>
-                                               <groupId>org.codehaus.mojo</groupId>
-                                               <artifactId>rpm-maven-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>rpm-node-tp</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>argeo-node-tp</name>
-                                                                       <classifier>rpm-tp</classifier>
-                                                                       <projversion>${version.argeo-distribution}</projversion>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/osgi</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>${project.build.directory}/node-tp</location>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-</project>
index 38a71bbfc541648f25dc2b2efe9202510c575071..5445ebfc3bf4bcc36d5325af8da8632254aefa37 100644 (file)
@@ -12,7 +12,7 @@
        <name>Commons Security Dependencies</name>
        <packaging>pom</packaging>
        <modules>
-               <module>org.argeo.security.dep.ads</module>
+<!--           <module>org.argeo.security.dep.ads</module> -->
                <module>org.argeo.security.dep.node</module>
        </modules>
 </project>
\ No newline at end of file
diff --git a/security/features/org.argeo.security.dep.node.eclipse/META-INF/MANIFEST.MF b/security/features/org.argeo.security.dep.node.eclipse/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..d33f27c
--- /dev/null
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0\r
+Private-Package: .\r
+Tool: Bnd-1.15.0\r
+Bundle-Name: Node Eclipse Perspectives\r
+Created-By: 1.6.0_20 (Sun Microsystems Inc.)\r
+Bundle-RequiredExecutionEnvironment: J2SE-1.5\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.3.4.SNAPSHOT-r20111209_145052\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-SymbolicName: org.argeo.security.dep.node.eclipse\r
+Bundle-DocURL: http://www.argeo.org\r
+\r
diff --git a/security/features/org.argeo.security.dep.node.eclipse/p2.inf b/security/features/org.argeo.security.dep.node.eclipse/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
diff --git a/security/features/org.argeo.security.dep.node.eclipse/pom.xml b/security/features/org.argeo.security.dep.node.eclipse/pom.xml
new file mode 100644 (file)
index 0000000..3a1c6c3
--- /dev/null
@@ -0,0 +1,126 @@
+<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.argeo.commons.security</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>features</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.security.dep.node.eclipse</artifactId>
+       <name>Node Eclipse Perspectives</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                       <executions>
+                                               <execution>
+                                                       <id>generate-descriptors</id>
+                                                       <goals>
+                                                               <goal>descriptors</goal>
+                                                       </goals>
+                                                       <phase>generate-resources</phase>
+                                               </execution>
+                                       </executions>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <!-- Applications -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.jcr.ui.explorer</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.osgi</groupId>
+                       <artifactId>org.argeo.osgi.ui.explorer</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.ui.admin</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Basis -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dep.node</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+       </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.apache.maven.plugins</groupId>
+                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>copy-direct</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <excludeTransitive>true</excludeTransitive>
+                                                                       <outputDirectory>${project.build.directory}/argeo-node-eclipse</outputDirectory>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-node-eclipse</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-node-eclipse</name>
+                                                                       <copyright>2011 Argeo</copyright>
+                                                                       <classifier>rpm-eclipse</classifier>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/eclipse</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <dependency>
+                                                                                               <includes>
+                                                                                                       <include>org.argeo.commons.eclipse:org.argeo.eclipse.ui</include>
+                                                                                                       <include>org.argeo.commons.eclipse:org.argeo.eclipse.ui.jcr</include>
+                                                                                                       <include>org.argeo.commons.security:org.argeo.security.equinox</include>
+                                                                                                       <include>org.argeo.commons.security:org.argeo.security.ui</include>
+                                                                                                       <include>org.argeo.commons.security:org.argeo.security.ui.admin</include>
+                                                                                               </includes>
+                                                                                       </dependency>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/argeo-node-eclipse</location>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-node</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+</project>
index 8e93697bff7102f8218b49159ba4a605cb45b8ac..6fac5a061aec65a655bda280a14d9cd87bc25a12 100644 (file)
@@ -8,16 +8,38 @@
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.security.dep.node.rap</artifactId>
-       <name>Commons Node RAP Dependencies</name>
-       <packaging>jar</packaging>
-       <properties>
-               <version.rap>1.3.2</version.rap>
-       </properties>
+       <name>Node Eclipse RAP</name>
        <build>
                <plugins>
                        <plugin>
                                <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>generate-descriptors</id>
+                                               <goals>
+                                                       <goal>descriptors</goal>
+                                               </goals>
+                                               <phase>generate-resources</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>resolve-pde-sources</id>
+                                               <goals>
+                                                       <goal>pde-sources</goal>
+                                               </goals>
+                                               <phase>generate-resources</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>check-osgi</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>equinox</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <onlyCheck>true</onlyCheck>
+                                               </configuration>
+                                       </execution>
+                               </executions>
                        </plugin>
                </plugins>
        </build>
                        <id>rpmbuild</id>
                        <build>
                                <plugins>
-                                       <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>copy-argeo-eclipse</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>copy-dependencies</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeGroupIds>org.argeo.commons.eclipse</includeGroupIds>
-                                                                       <excludeArtifactIds>org.argeo.eclipse.ui.rap</excludeArtifactIds>
-                                                                       <outputDirectory>${project.build.directory}/argeo-node-eclipse</outputDirectory>
-                                                               </configuration>
-                                                       </execution>
-                                                       <execution>
-                                                               <id>copy-direct</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>copy-dependencies</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <excludeTransitive>true</excludeTransitive>
-                                                                       <excludeArtifactIds>org.argeo.security.ui.rap,org.argeo.server.rap.webapp</excludeArtifactIds>
-                                                                       <outputDirectory>${project.build.directory}/argeo-node-eclipse</outputDirectory>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
-                                                       <execution>
-                                                               <id>rpm-node-eclipse</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>argeo-node-eclipse</name>
-                                                                       <copyright>2011 Argeo</copyright>
-                                                                       <classifier>rpm-eclipse</classifier>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/osgi/eclipse</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <dependency>
-                                                                                               <includes>
-                                                                                                       <include>org.argeo.commons.eclipse:org.argeo.eclipse.ui</include>
-                                                                                                       <include>org.argeo.commons.eclipse:org.argeo.eclipse.ui.jcr</include>
-                                                                                                       <include>org.argeo.commons.security:org.argeo.security.equinox</include>
-                                                                                                       <include>org.argeo.commons.security:org.argeo.security.ui</include>
-                                                                                                       <include>org.argeo.commons.security:org.argeo.security.ui.admin</include>
-                                                                                               </includes>
-                                                                                       </dependency>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>${project.build.directory}/argeo-node-eclipse</location>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                               </configuration>
-                                                       </execution>
                                                </executions>
                                        </plugin>
                                        <plugin>
                                </plugins>
                        </build>
                </profile>
-               <profile>
-                       <id>rpmbuild-tp</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>copy-rap</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>copy-dependencies</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeGroupIds>org.eclipse.core,org.eclipse.equinox,org.eclipse.rap,org.eclipse.help,org.argeo.dep.rap,org.eclipse.osgi,com.ibm.icu</includeGroupIds>
-                                                                       <outputDirectory>${project.build.directory}/eclipse-rap</outputDirectory>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                                       <plugin>
-                                               <groupId>org.codehaus.mojo</groupId>
-                                               <artifactId>rpm-maven-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <id>rpm-rap</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>rpm</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <name>eclipse-rap</name>
-                                                                       <projversion>${version.rap}</projversion>
-                                                                       <mappings>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/eclipse-rap</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <sources>
-                                                                                               <source>
-                                                                                                       <location>${project.build.directory}/eclipse-rap</location>
-                                                                                               </source>
-                                                                                       </sources>
-                                                                               </mapping>
-                                                                       </mappings>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
        </profiles>
 </project>
index 281755cb820debeda5703964ff3b29faf2c84528..d4bcf9bfd587dc6a6e78974fcdd758f789577214 100644 (file)
@@ -8,38 +8,38 @@
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.security.dep.node.rcp</artifactId>
-       <name>Commons Node RCP Dependencies</name>
-       <packaging>jar</packaging>
+       <name>Node Eclipse RCP</name>
        <build>
                <plugins>
                        <plugin>
                                <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>generate-descriptors</id>
+                                               <goals>
+                                                       <goal>descriptors</goal>
+                                               </goals>
+                                               <phase>generate-resources</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>check-osgi</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>equinox</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <onlyCheck>true</onlyCheck>
+                                               </configuration>
+                                       </execution>
+                               </executions>
                        </plugin>
                </plugins>
        </build>
        <dependencies>
-               <!-- Applications -->
-               <dependency>
-                       <groupId>org.argeo.commons.server</groupId>
-                       <artifactId>org.argeo.jcr.ui.explorer</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
-                       <artifactId>org.argeo.osgi.ui.explorer</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.ui.admin</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
-               </dependency>
-
-               <!-- Basis -->
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.dep.node</artifactId>
+                       <artifactId>org.argeo.security.dep.node.eclipse</artifactId>
                        <version>0.3.4-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
                                                        </execution>
                                                </executions>
                                        </plugin>
-                                       <plugin>
-                                               <artifactId>maven-antrun-plugin</artifactId>
-                                               <executions>
-                                                       <execution>
-                                                               <phase>install</phase>
-                                                               <goals>
-                                                                       <goal>run</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <target>
-                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
-                                                                                       <fileset dir="${project.build.directory}/rpm"
-                                                                                               includes="*/RPMS/**/*.rpm" />
-                                                                                       <flattenmapper />
-                                                                               </copy>
-                                                                       </target>
-                                                               </configuration>
-                                                       </execution>
-                                               </executions>
-                                       </plugin>
-<!--                                   <plugin> -->
-<!--                                           <groupId>org.codehaus.mojo</groupId> -->
-<!--                                           <artifactId>exec-maven-plugin</artifactId> -->
-<!--                                           <executions> -->
-<!--                                                   <execution> -->
-<!--                                                           <phase>install</phase> -->
-<!--                                                           <goals> -->
-<!--                                                                   <goal>exec</goal> -->
-<!--                                                           </goals> -->
-<!--                                                           <configuration> -->
-<!--                                                                   <executable>createrepo</executable> -->
-<!--                                                                   <arguments> -->
-<!--                                                                           <argument>${rpm.stagingRepository}</argument> -->
-<!--                                                                   </arguments> -->
-<!--                                                           </configuration> -->
-<!--                                                   </execution> -->
-<!--                                           </executions> -->
-<!--                                   </plugin> -->
                                </plugins>
                        </build>
                </profile>
diff --git a/security/features/org.argeo.security.dep.node/p2.inf b/security/features/org.argeo.security.dep.node/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
diff --git a/security/features/org.argeo.security.dep.node/pom.xml b/security/features/org.argeo.security.dep.node/pom.xml
new file mode 100644 (file)
index 0000000..8e976cb
--- /dev/null
@@ -0,0 +1,404 @@
+<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.argeo.commons.security</groupId>
+               <version>0.3.4-SNAPSHOT</version>
+               <artifactId>features</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.security.dep.node</artifactId>
+       <name>Node Backend</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>generate-descriptors</id>
+                                               <goals>
+                                                       <goal>descriptors</goal>
+                                               </goals>
+                                               <phase>generate-resources</phase>
+                                       </execution>
+                                       <execution>
+                                               <id>check-osgi</id>
+                                               <phase>test</phase>
+                                               <goals>
+                                                       <goal>equinox</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <onlyCheck>true</onlyCheck>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <!-- Base runtime -->
+               <dependency>
+                       <groupId>org.argeo.commons.osgi</groupId>
+                       <artifactId>org.argeo.osgi.dep.stdruntime</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+
+               <!-- Argeo Security -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.core</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.mvc</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Xerces and Xalan -->
+               <dependency>
+                       <groupId>org.apache.xmlcommons</groupId>
+                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.xalan</groupId>
+                       <artifactId>com.springsource.org.apache.xalan</artifactId>
+               </dependency>
+
+               <!-- Spring -->
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.extender</artifactId>
+               </dependency>
+
+               <!-- Jackrabbit -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.jackrabbit</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.jackrabbit</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.node.repo.jackrabbit</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Active MQ -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.dep.activemq</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.activemq</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.activemq.broker</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Javax -->
+               <dependency>
+                       <groupId>javax.xml.soap</groupId>
+                       <artifactId>com.springsource.javax.xml.soap</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.activation</groupId>
+                       <artifactId>com.springsource.javax.activation</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.annotation</groupId>
+                       <artifactId>com.springsource.javax.annotation</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.xml.ws</groupId>
+                       <artifactId>com.springsource.javax.xml.ws</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.xml.bind</groupId>
+                       <artifactId>com.springsource.javax.xml.bind</artifactId>
+               </dependency>
+
+               <!-- Commons -->
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>com.springsource.org.apache.commons.vfs</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.commons.exec</artifactId>
+               </dependency>
+
+               <!-- Security (LDAP) -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dao.ldap</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.ldap</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Security (Jackrabbit) -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dao.jackrabbit</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Security (Standalone) -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dao.os</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Web -->
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.web.extender</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.web</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.dep.tomcat</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.webextender</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.jcr.mvc</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.jackrabbit.webapp</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+
+               <!-- Default Tomcat conf -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.tomcat</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+
+               <!-- LDAP server -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.dep.ads</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.ads.server</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.ads</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+               <!-- <dependency> -->
+               <!-- <groupId>org.argeo.commons.server</groupId> -->
+               <!-- <artifactId>org.argeo.server.json</artifactId> -->
+               <!-- <version>0.3.4-SNAPSHOT</version> -->
+               <!-- </dependency> -->
+
+               <!-- Hibernate -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.dep.hibernate</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+
+               <!-- DB drivers -->
+               <dependency>
+                       <groupId>com.h2database</groupId>
+                       <artifactId>com.springsource.org.h2</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>com.mysql.jdbc</groupId>
+                       <artifactId>com.springsource.com.mysql.jdbc</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.postgresql</groupId>
+                       <artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
+               </dependency>
+
+               <!-- Software development -->
+               <dependency>
+                       <groupId>org.argeo.commons.basic</groupId>
+                       <artifactId>org.argeo.support.junit</artifactId>
+                       <version>0.3.4-SNAPSHOT</version>
+               </dependency>
+       </dependencies>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.apache.maven.plugins</groupId>
+                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>copy-node</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <includeGroupIds>org.argeo.commons.basic,org.argeo.commons.osgi,org.argeo.commons.server,org.argeo.commons.security</includeGroupIds>
+                                                                       <excludeArtifactIds>org.argeo.osgi.boot</excludeArtifactIds>
+                                                                       <outputDirectory>${project.build.directory}/node</outputDirectory>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-node</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-node</name>
+                                                                       <copyright>2011 Argeo</copyright>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/node</location>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                                       <requires>
+                                                                               <require>argeo-node-tp</require>
+                                                                       </requires>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${rpm.stagingRepository}" verbose="true">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+               <profile>
+                       <id>rpmbuild-tp</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.apache.maven.plugins</groupId>
+                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>copy-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>copy-dependencies</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <includeTypes>jar</includeTypes>
+                                                                       <excludeGroupIds>org.argeo.commons.basic,org.argeo.commons.osgi,org.argeo.commons.server,org.argeo.commons.security</excludeGroupIds>
+                                                                       <excludeArtifactIds>org.eclipse.osgi</excludeArtifactIds>
+                                                                       <outputDirectory>${project.build.directory}/node-tp</outputDirectory>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               <groupId>org.codehaus.mojo</groupId>
+                                               <artifactId>rpm-maven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>rpm-node-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <name>argeo-node-tp</name>
+                                                                       <classifier>rpm-tp</classifier>
+                                                                       <projversion>${version.argeo-distribution}</projversion>
+                                                                       <mappings>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <sources>
+                                                                                               <source>
+                                                                                                       <location>${project.build.directory}/node-tp</location>
+                                                                                               </source>
+                                                                                       </sources>
+                                                                               </mapping>
+                                                                       </mappings>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+</project>
index d393a6fcc7b165f5f7940b5802a5a368554b2507..b535fb1c7432be4be91b9cc69ef12a72470fec04 100644 (file)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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.argeo.commons</groupId>
@@ -12,6 +13,8 @@
        <name>Commons Security Features</name>
        <packaging>pom</packaging>
        <modules>
+               <module>org.argeo.security.dep.node</module>
+               <module>org.argeo.security.dep.node.eclipse</module>
                <module>org.argeo.security.dep.node.rap</module>
                <module>org.argeo.security.dep.node.rcp</module>
        </modules>
                        </resource>
                </resources>
                <plugins>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>buildnumber-maven-plugin</artifactId>
-                               <configuration>
-                                       <useLastCommittedRevision>false</useLastCommittedRevision>
-                               </configuration>
-                       </plugin>
                        <plugin>
                                <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <manifestLocation>META-INF</manifestLocation>
-                               </configuration>
                        </plugin>
                </plugins>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <groupId>org.argeo.maven.plugins</groupId>
-                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <executions>
-                                               <execution>
-                                                       <id>resolve-pde-sources</id>
-                                                       <goals>
-                                                               <goal>pde-sources</goal>
-                                                       </goals>
-                                                       <phase>generate-resources</phase>
-                                               </execution>
-                                               <execution>
-                                                       <id>generate-descriptors</id>
-                                                       <goals>
-                                                               <goal>descriptors</goal>
-                                                       </goals>
-                                                       <phase>generate-resources</phase>
-                                               </execution>
-                                               <execution>
-                                                       <id>check-osgi</id>
-                                                       <phase>test</phase>
-                                                       <goals>
-                                                               <goal>equinox</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <onlyCheck>true</onlyCheck>
-                                                               <argsToAppend>
-                                                                       <arg>-clean</arg>
-                                                               </argsToAppend>
-                                                       </configuration>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-               
        </build>
+       <profiles>
+               <profile>
+                       <id>rpmbuild</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-antrun-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>install</phase>
+                                                               <goals>
+                                                                       <goal>run</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <target>
+                                                                               <copy todir="${rpm.stagingRepository}" verbose="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                                       <flattenmapper />
+                                                                               </copy>
+                                                                       </target>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>
\ No newline at end of file
index 7a05b23dc404f01d624cff9e2ccc83327b4d377b..def38344dfba2362fc6fd2f137751a4ed99df019 100644 (file)
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <manifestLocation>META-INF</manifestLocation>
-                                       <instructions>
-                                               <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                                       </instructions>
-                               </configuration>
                        </plugin>
                </plugins>
        </build>
index 9f7925a7652981398c431d3108a57a614f3274ce..8ec7baeeeeea4ec43a681f8b175ea32d16a17050 100644 (file)
@@ -15,7 +15,7 @@
                <module>runtime</module>
                <module>modules</module>
                <module>plugins</module>
-               <module>dep</module>
+<!--           <module>dep</module> -->
                <module>features</module>
        </modules>
 </project>
\ No newline at end of file
index fbe66b11942a5346f82d7bcdf40c5a8a2092eaeb..c232d5b1901ba468b079cea2f928f77e06949584 100644 (file)
@@ -59,7 +59,6 @@
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <extensions>true</extensions>
                        </plugin>
                </plugins>
        </build>
index ff70e10aebecebffe452a5ac549bf061b0196b19..65b810d4573792b672416964e2d2228005e8fccf 100644 (file)
                        <groupId>javax.xml.rpc</groupId>
                        <artifactId>com.springsource.javax.xml.rpc</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet.jsp</artifactId>
-               </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
                        <artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>