From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 1 Sep 2011 07:40:45 +0000 (+0000)
Subject: Minimal server / RAP
X-Git-Tag: argeo-commons-2.1.30~1182
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=5e00368952f7ad5886496e4b902ced8b980f14bc;p=lgpl%2Fargeo-commons.git

Minimal server / RAP

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

diff --git a/demo/argeo-node-web.properties b/demo/argeo-node-web.properties
index 02070532d..900e31ef7 100644
--- a/demo/argeo-node-web.properties
+++ b/demo/argeo-node-web.properties
@@ -1,11 +1,9 @@
 argeo.osgi.start=\
 org.springframework.osgi.extender,\
-org.argeo.server.ads.server,\
 org.argeo.node.repofactory.jackrabbit,\
 org.argeo.node.repo.jackrabbit,\
 org.argeo.security.dao.ldap,\
 org.argeo.security.services,\
-org.argeo.security.services.admin,\
 org.argeo.security.equinox,\
 org.eclipse.core.runtime,\
 org.eclipse.equinox.common,\
@@ -13,14 +11,13 @@ org.eclipse.equinox.http.registry,\
 org.eclipse.equinox.launcher,\
 org.argeo.dep.osgi.catalina.start,\
 org.argeo.jackrabbit.webapp,\
+org.argeo.server.rap.webapp,\
 org.argeo.jcr.ui.explorer,\
-org.argeo.node.repo.jackrabbit,\
-org.argeo.security.dao.ldap,\
-org.argeo.security.equinox,\
-org.argeo.security.services,\
-org.argeo.security.services.admin,\
+org.argeo.security.ui,\
+org.argeo.security.ui.rap,\
+org.argeo.security.ui.admin,\
 org.argeo.server.ads.server,\
-org.argeo.server.osgi.webapp,\
+org.springframework.osgi.web.extender,\
 
 org.argeo.security.ui.initialPerspective=org.argeo.jcr.ui.explorer.perspective
 
diff --git a/demo/log4j.properties b/demo/log4j.properties
index cd83759a4..65ac43da1 100644
--- a/demo/log4j.properties
+++ b/demo/log4j.properties
@@ -1,4 +1,4 @@
-log4j.rootLogger=WARN, console
+log4j.rootLogger=WARN, development
 
 ## Levels
 log4j.logger.org.argeo=DEBUG
@@ -24,3 +24,8 @@ 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
+
+# development appender (slow!)
+log4j.appender.development=org.apache.log4j.ConsoleAppender
+log4j.appender.development.layout=org.apache.log4j.PatternLayout
+log4j.appender.development.layout.ConversionPattern=%d{HH:mm:ss} [%16.16t] %5p %m (%F:%L) %c%n
diff --git a/security/features/org.argeo.security.dep.node.rap/pom.xml b/security/features/org.argeo.security.dep.node.rap/pom.xml
index e4de2d5ca..8c167d4ae 100644
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/pom.xml
@@ -1,4 +1,5 @@
-<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.security</groupId>
@@ -130,6 +131,14 @@
 			<version>${version.argeo-commons}</version>
 		</dependency>
 
+		<!-- Default Tomcat conf (for development) -->
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.tomcat</artifactId>
+			<version>${version.argeo-commons}</version>
+			<scope>test</scope>
+		</dependency>
+
 		<!-- LDAP server (target platform generation only) -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>