From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 20 Jun 2010 19:05:03 +0000 (+0000)
Subject: Fix broken dependencies
X-Git-Tag: argeo-slc-2.1.7~1280
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=c2837772fb96c1f12088a859966a8d7914b5a58e;p=gpl%2Fargeo-slc.git

Fix broken dependencies

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

diff --git a/demo/log4j.properties b/demo/log4j.properties
new file mode 100644
index 000000000..694a56334
--- /dev/null
+++ b/demo/log4j.properties
@@ -0,0 +1,46 @@
+log4j.rootLogger=WARN, console
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+log4j.logger.org.argeo.slc.execution.ExecutionParameterPostProcessor=TRACE
+log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG
+log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG
+log4j.logger.org.argeo.security.mvc.ArgeoRememberMeServices=WARN
+#log4j.logger.org.argeo.server.jcr.mvc.OpenSessionInViewJcrInterceptor=TRACE
+
+#log4j.logger.org.argeo.slc.web.mvc=TRACE
+#log4j.logger.org.argeo.slc.jms=TRACE
+#log4j.logger.org.argeo.server.json=TRACE
+
+log4j.logger.org.hibernate=WARN
+
+log4j.logger.org.springframework=WARN
+#log4j.logger.org.springframework.web=DEBUG
+#log4j.logger.org.springframework.jms=WARN
+#log4j.logger.org.springframework.security=DEBUG
+#log4j.logger.org.springframework.ldap=TRACE
+#log4j.logger.org.springframework.osgi.web=TRACE
+
+log4j.logger.org.apache.activemq=WARN
+log4j.logger.org.apache.activemq.transport=WARN
+log4j.logger.org.apache.activemq.ActiveMQMessageConsumer=INFO
+log4j.logger.org.apache.activemq.ActiveMQMessageProducer=INFO
+
+log4j.logger.org.apache.catalina=INFO
+log4j.logger.org.apache.coyote=INFO
+log4j.logger.org.apache.tomcat=INFO
+
+log4j.logger.org.apache.directory.server=INFO
+log4j.logger.org.apache.directory.server.core.partition=ERROR
+log4j.logger.org.apache.directory.server.core.schema.bootstrap.BootstrapAttributeTypeRegistry=ERROR
+
+log4j.logger.org.apache.jackrabbit=WARN
+log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR
+
+## Appenders
+# console is set to be a ConsoleAppender.
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+
+# console uses PatternLayout.
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c - [%t]%n
diff --git a/demo/pom.xml b/demo/pom.xml
index 34d58fb96..ed5c980c5 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -39,10 +39,9 @@
 							<execDir>target/exec/server</execDir>
 							<systemPropertiesFile>server.properties</systemPropertiesFile>
 							<systemProperties>
+								<log4j.configuration>file:${basedir}/log4j.properties</log4j.configuration>
 								<argeo.osgi.bundles>
-									${basedir}/site;in=*;ex=pom.xml;ex=target,
 									${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
-									${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
 								</argeo.osgi.bundles>
 							</systemProperties>
 						</configuration>
@@ -74,9 +73,7 @@
 							<systemPropertiesFile>server_jcr.properties</systemPropertiesFile>
 							<systemProperties>
 								<argeo.osgi.bundles>
-									${basedir}/site;in=*;ex=pom.xml;ex=target,
 									${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
-									${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
 								</argeo.osgi.bundles>
 							</systemProperties>
 						</configuration>
@@ -122,6 +119,11 @@
 					<artifactId>org.argeo.slc.dep.agent</artifactId>
 					<version>${project.version}</version>
 				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc.dep</groupId>
+					<artifactId>org.argeo.slc.dep.agent.extras</artifactId>
+					<version>${project.version}</version>
+				</dependency>
 			</dependencies>
 		</profile>
 		<profile>
@@ -230,7 +232,6 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.slc.dep</groupId>
-					<artifactId>org.argeo.slc.dep.server</artifactId>
 					<version>${project.version}</version>
 				</dependency>
 				<dependency>
diff --git a/dep/org.argeo.slc.dep.agent.extras/p2.inf b/dep/org.argeo.slc.dep.agent.extras/p2.inf
new file mode 100644
index 000000000..0423aa509
--- /dev/null
+++ b/dep/org.argeo.slc.dep.agent.extras/p2.inf
@@ -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/dep/org.argeo.slc.dep.agent.extras/pom.xml b/dep/org.argeo.slc.dep.agent.extras/pom.xml
new file mode 100644
index 000000000..6a2f47706
--- /dev/null
+++ b/dep/org.argeo.slc.dep.agent.extras/pom.xml
@@ -0,0 +1,19 @@
+<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.slc</groupId>
+		<artifactId>dep</artifactId>
+		<version>0.12.2-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<groupId>org.argeo.slc.dep</groupId>
+	<artifactId>org.argeo.slc.dep.agent.extras</artifactId>
+	<packaging>jar</packaging>
+	<name>SLC Agent Extras Dependencies</name>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.support.maven</artifactId>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.sdk/pom.xml b/dep/org.argeo.slc.dep.sdk/pom.xml
index feb6658b7..34d011ab4 100644
--- a/dep/org.argeo.slc.dep.sdk/pom.xml
+++ b/dep/org.argeo.slc.dep.sdk/pom.xml
@@ -27,6 +27,11 @@
 			<artifactId>org.argeo.slc.dep.agent</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.dep</groupId>
+			<artifactId>org.argeo.slc.dep.agent.extras</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
 			<artifactId>org.argeo.slc.dep.server</artifactId>
@@ -52,10 +57,6 @@
 			<groupId>org.argeo.slc.server</groupId>
 			<artifactId>org.argeo.slc.ria</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.maven</artifactId>
-		</dependency>
 
 		<!-- Modules (see profiles below) -->
 
diff --git a/dep/pom.xml b/dep/pom.xml
index 3ceed3cb3..98e0789a1 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -12,8 +12,9 @@
 	<packaging>pom</packaging>
 	<name>SLC Dependencies</name>
 	<modules>
-		<module>org.argeo.slc.dep.server</module>
 		<module>org.argeo.slc.dep.agent</module>
+		<module>org.argeo.slc.dep.agent.extras</module>
+		<module>org.argeo.slc.dep.server</module>
 		<module>org.argeo.slc.dep.detached</module>
 		<module>org.argeo.slc.dep.gis</module>
 		<module>org.argeo.slc.dep.sdk</module>