X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fdep%2Forg.argeo.security.dep.node%2Fpom.xml;h=9800b6ae905370e3b9434a812fd3cda892dcbe6d;hb=a52e5c9b1cca9109f159b90f3eda439ed6077f04;hp=be7de50caab90ec9a2f000f93aeeb5321b27457c;hpb=d7a8e0309cdbebaaf96954aea2860205169b0628;p=lgpl%2Fargeo-commons.git

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index be7de50ca..9800b6ae9 100644
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -2,29 +2,24 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons.security</groupId>
-		<version>0.3.1-SNAPSHOT</version>
+		<version>1.1.1-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.dep.node</artifactId>
-	<name>Commons Node Dependencies</name>
-	<packaging>pom</packaging>
+	<name>Node Backend</name>
 	<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>
+						<id>generate-descriptors</id>
 						<goals>
-							<goal>equinox</goal>
+							<goal>descriptors</goal>
 						</goals>
-						<configuration>
-							<onlyCheck>true</onlyCheck>
-						</configuration>
+						<phase>generate-resources</phase>
 					</execution>
 				</executions>
 			</plugin>
@@ -35,124 +30,241 @@
 		<dependency>
 			<groupId>org.argeo.commons.osgi</groupId>
 			<artifactId>org.argeo.osgi.dep.stdruntime</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
+
+		<!-- Argeo Security -->
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.javax</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
-			<type>pom</type>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.core</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.mvc</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Xerces and Xalan -->
 		<dependency>
 			<groupId>org.apache.xmlcommons</groupId>
 			<artifactId>com.springsource.org.apache.xmlcommons</artifactId>
 		</dependency>
-		<!-- Security services -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.core</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<groupId>org.apache.xalan</groupId>
+			<artifactId>com.springsource.org.apache.xalan</artifactId>
 		</dependency>
+
+		<!-- Javax -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.ldap</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<groupId>javax.xml.soap</groupId>
+			<artifactId>com.springsource.javax.xml.soap</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.services</artifactId>
-			<version>${version.argeo-commons}</version>
+			<groupId>javax.activation</groupId>
+			<artifactId>com.springsource.javax.activation</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dao.ldap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<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>
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>com.springsource.javax.mail</artifactId>
 		</dependency>
 
-		<!-- LDAP server -->
+		<!-- Commons -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.ads</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
-			<type>pom</type>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.vfs</artifactId>
 		</dependency>
-		<!-- Tomcat -->
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.tomcat</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
-			<type>pom</type>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.commons.exec</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.webextender</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web.extender</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
+		</dependency>
+
+		<!-- Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.context.support</artifactId>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.springframework</groupId> -->
+		<!-- <artifactId>org.springframework.orm</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.springframework</groupId> -->
+		<!-- <artifactId>org.springframework.jdbc</artifactId> -->
+		<!-- </dependency> -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.jms</artifactId>
+		</dependency>
+
+		<!-- Spring OSGi -->
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web</artifactId>
+			<artifactId>org.springframework.osgi.extender</artifactId>
+		</dependency>
+
+		<!-- Jackrabbit -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jackrabbit</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.jackrabbit</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
+
 		<!-- Active MQ -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.dep.activemq</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.activemq</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
-		<!-- Jackrabbit -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.jackrabbit</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<artifactId>org.argeo.server.activemq.broker</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
+
+		<!-- Scheduling -->
+		<dependency>
+			<groupId>com.opensymphony.quartz</groupId>
+			<artifactId>com.springsource.org.quartz</artifactId>
+		</dependency>
+
+		<!-- Security (LDAP) -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.jackrabbit</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<artifactId>org.argeo.security.dao.ldap</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.jcr.mvc</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.ldap</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Security (Jackrabbit) -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dao.jackrabbit</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Security (Standalone) -->
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dao.os</artifactId>
+			<version>1.1.1-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.jackrabbit.server</artifactId>
-			<version>0.3.1-SNAPSHOT</version>
+			<artifactId>org.argeo.server.dep.tomcat</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.webextender</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jcr.mvc</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.jackrabbit.webapp</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
+
+		<!-- Default Tomcat conf -->
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.node.repo.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
+			<artifactId>org.argeo.server.tomcat</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+		</dependency>
+
+		<!-- LDAP server -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.dep.ads</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.node.repofactory.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
+			<artifactId>org.argeo.server.ads.server</artifactId>
+			<version>1.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.ads</artifactId>
+			<version>1.1.1-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.1-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
+
 		<!-- DB drivers -->
 		<dependency>
 			<groupId>com.h2database</groupId>
@@ -166,5 +278,164 @@
 			<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>1.1.1-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
+	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<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>
+				<!-- OSGi test -->
+				<dependency>
+					<groupId>org.argeo.commons.osgi</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>1.1.1-SNAPSHOT</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+		<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>
+				</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>