From a99280d2bc1abd897373dbeeb34a1c6fd53e637c Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 16 Mar 2011 17:24:07 +0000
Subject: [PATCH] Mode demo files

git-svn-id: https://svn.argeo.org/commons/trunk@4298 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 osgi/runtime/org.argeo.osgi.boot/pom.xml      |  12 --
 osgi/runtime/pom.xml                          |  45 ++++++++
 security/demo/.classpath                      |   6 -
 security/demo/.project                        |  17 ---
 .../demo/.settings/org.eclipse.jdt.core.prefs |   5 -
 .../.settings/org.maven.ide.eclipse.prefs     |   9 --
 .../argeo-node-ui.product}                    |  14 +--
 .../log4j.properties                          |   0
 .../META-INF/MANIFEST.MF                      |   3 -
 .../log4j.properties                          |  21 ----
 security/demo/pom.xml                         | 107 ------------------
 .../build.properties                          |   3 +-
 .../org.argeo.security.ui.rcp/plugin.xml      |   2 +-
 security/pom.xml                              |   1 -
 .../org.argeo.security.activemq/.classpath    |   1 +
 .../org/argeo/security/activemq/osLogin.conf  |   0
 .../runtime/org.argeo.security.core/pom.xml   |   1 +
 17 files changed, 56 insertions(+), 191 deletions(-)
 delete mode 100644 security/demo/.classpath
 delete mode 100644 security/demo/.project
 delete mode 100644 security/demo/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 security/demo/.settings/org.maven.ide.eclipse.prefs
 rename security/{plugins/org.argeo.security.ui.rcp/org.argeo.security.ui.application.product => demo/argeo-node-ui.product} (92%)
 rename security/{plugins/org.argeo.security.ui.rcp => demo}/log4j.properties (100%)
 delete mode 100644 security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF
 delete mode 100644 security/demo/org.argeo.security.demo.log4j/log4j.properties
 delete mode 100644 security/demo/pom.xml
 rename security/runtime/{org.argeo.security.core => org.argeo.security.activemq}/src/main/resources/org/argeo/security/activemq/osLogin.conf (100%)

diff --git a/osgi/runtime/org.argeo.osgi.boot/pom.xml b/osgi/runtime/org.argeo.osgi.boot/pom.xml
index 80e13a91b..a35daa9b8 100644
--- a/osgi/runtime/org.argeo.osgi.boot/pom.xml
+++ b/osgi/runtime/org.argeo.osgi.boot/pom.xml
@@ -19,18 +19,6 @@
 					<target>1.4</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
diff --git a/osgi/runtime/pom.xml b/osgi/runtime/pom.xml
index a284a3377..564ae9a0c 100644
--- a/osgi/runtime/pom.xml
+++ b/osgi/runtime/pom.xml
@@ -14,4 +14,49 @@
 	<modules>
 		<module>org.argeo.osgi.boot</module>
 	</modules>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>META-INF/**</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>META-INF</directory>
+							<includes>
+								<include>MANIFEST.MF</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file
diff --git a/security/demo/.classpath b/security/demo/.classpath
deleted file mode 100644
index d0bec0f76..000000000
--- a/security/demo/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/security/demo/.project b/security/demo/.project
deleted file mode 100644
index 85feecb52..000000000
--- a/security/demo/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.argeo.security.demo</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/security/demo/.settings/org.eclipse.jdt.core.prefs b/security/demo/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 742857a26..000000000
--- a/security/demo/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Wed Sep 16 19:11:49 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/security/demo/.settings/org.maven.ide.eclipse.prefs b/security/demo/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 004ee666a..000000000
--- a/security/demo/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Wed Sep 16 19:09:41 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/security/plugins/org.argeo.security.ui.rcp/org.argeo.security.ui.application.product b/security/demo/argeo-node-ui.product
similarity index 92%
rename from security/plugins/org.argeo.security.ui.rcp/org.argeo.security.ui.application.product
rename to security/demo/argeo-node-ui.product
index 3fabf3a19..9dba05536 100644
--- a/security/plugins/org.argeo.security.ui.rcp/org.argeo.security.ui.application.product
+++ b/security/demo/argeo-node-ui.product
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="SecureRCP" application="org.argeo.security.ui.application.secureUi" useFeatures="false" includeLaunchers="true">
+<product name="Argeo Node UI" application="org.argeo.security.ui.rcp.secureUi" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
 
    <launcherArgs>
       <programArgs>-console -clean</programArgs>
-      <vmArgs>-Dlog4j.configuration=file:${system_property:user.home}/dev/src/commons/security/plugins/org.argeo.security.ui.application/log4j.properties</vmArgs>
+      <vmArgs>-Dlog4j.configuration=&quot;file:${system_property:user.home}/dev/src/commons/security/demo/log4j.properties&quot;</vmArgs>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
    </launcherArgs>
 
@@ -90,8 +90,11 @@
       <plugin id="org.argeo.dep.osgi.tagsoup"/>
       <plugin id="org.argeo.dep.osgi.tika"/>
       <plugin id="org.argeo.eclipse.ui"/>
+      <plugin id="org.argeo.eclipse.ui.jcr"/>
+      <plugin id="org.argeo.eclipse.ui.rcp"/>
       <plugin id="org.argeo.infra.core"/>
       <plugin id="org.argeo.infra.security.services" fragment="true"/>
+      <plugin id="org.argeo.jcr.ui.explorer"/>
       <plugin id="org.argeo.node.repo.jackrabbit"/>
       <plugin id="org.argeo.security.core"/>
       <plugin id="org.argeo.security.equinox"/>
@@ -100,7 +103,7 @@
       <plugin id="org.argeo.security.manager.ldap"/>
       <plugin id="org.argeo.security.services"/>
       <plugin id="org.argeo.security.ui"/>
-      <plugin id="org.argeo.security.ui.application"/>
+      <plugin id="org.argeo.security.ui.rcp"/>
       <plugin id="org.argeo.server.ads"/>
       <plugin id="org.argeo.server.ads.server"/>
       <plugin id="org.argeo.server.core"/>
@@ -110,9 +113,6 @@
       <plugin id="org.argeo.server.jcr.mvc"/>
       <plugin id="org.argeo.server.json"/>
       <plugin id="org.argeo.server.tika.jackrabbit" fragment="true"/>
-      <plugin id="org.argeo.slc.agent.ext.xalan" fragment="true"/>
-      <plugin id="org.argeo.slc.demo.log4j" fragment="true"/>
-      <plugin id="org.argeo.slc.gis.ext.dbcp" fragment="true"/>
       <plugin id="org.eclipse.core.commands"/>
       <plugin id="org.eclipse.core.contenttype"/>
       <plugin id="org.eclipse.core.databinding"/>
@@ -131,6 +131,7 @@
       <plugin id="org.eclipse.jface.databinding"/>
       <plugin id="org.eclipse.osgi"/>
       <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
       <plugin id="org.eclipse.ui"/>
@@ -144,7 +145,6 @@
       <plugin id="org.springframework.osgi.extender"/>
       <plugin id="org.springframework.osgi.io"/>
       <plugin id="org.springframework.oxm"/>
-      <plugin id="org.springframework.security.acls" fragment="true"/>
       <plugin id="org.springframework.security.core"/>
       <plugin id="org.springframework.transaction"/>
       <plugin id="org.springframework.web"/>
diff --git a/security/plugins/org.argeo.security.ui.rcp/log4j.properties b/security/demo/log4j.properties
similarity index 100%
rename from security/plugins/org.argeo.security.ui.rcp/log4j.properties
rename to security/demo/log4j.properties
diff --git a/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF b/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF
deleted file mode 100644
index 87597b0af..000000000
--- a/security/demo/org.argeo.security.demo.log4j/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-SymbolicName: org.argeo.security.demo.log4j
-Bundle-Version: 0.2.3.SNAPSHOT
-Fragment-Host: com.springsource.org.apache.log4j
diff --git a/security/demo/org.argeo.security.demo.log4j/log4j.properties b/security/demo/org.argeo.security.demo.log4j/log4j.properties
deleted file mode 100644
index 87bf4b768..000000000
--- a/security/demo/org.argeo.security.demo.log4j/log4j.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=DEBUG
-log4j.logger.org.argeo.server.json=TRACE
-log4j.logger.org.argeo.security.core=TRACE
-
-log4j.logger.org.springframework=WARN
-log4j.logger.org.springframework.security=WARN
-
-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.catalina.core.ContainerBase=INFO
-log4j.logger.org.apache.coyote=INFO
-
-## Appenders
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
diff --git a/security/demo/pom.xml b/security/demo/pom.xml
deleted file mode 100644
index df0985700..000000000
--- a/security/demo/pom.xml
+++ /dev/null
@@ -1,107 +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</groupId>
-		<version>0.2.3-SNAPSHOT</version>
-		<artifactId>security</artifactId>
-		<relativePath>..</relativePath>
-	</parent>
-	<groupId>org.argeo.security</groupId>
-	<artifactId>demo</artifactId>
-	<packaging>bundles</packaging>
-	<name>Commons Security Demo</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<version>${version.maven-argeo-osgi}</version>
-				<extensions>true</extensions>
-				<configuration>
-					<bundlesPomArtifactId>org.argeo.security.demo</bundlesPomArtifactId>
-					<execDir>target/exec</execDir>
-					<osgiBootArtifactId>org.argeo.osgi.boot</osgiBootArtifactId>
-					<argsToAppend>
-						<arg>-clean</arg>
-					</argsToAppend>
-					<fork>false</fork>
-					<systemProperties>
-						<argeo.osgi.start>
-							org.springframework.osgi.extender,
-							org.springframework.osgi.web.extender,
-							org.argeo.dep.osgi.catalina.start,
-							org.argeo.security.manager.ldap,
-							org.argeo.security.webapp,
-							org.argeo.security.ria,
-							org.argeo.security.core,
-							org.argeo.server.ads.server
-						</argeo.osgi.start>
-						<argeo.osgi.bundles>
-							${basedir};in=*;ex=pom.xml;ex=target;ex=.*;ex=*.ldif,
-							${basedir}/../modules;in=*;ex=pom.xml;ex=target;ex=.*,
-							${basedir}/../../server/modules;in=*;ex=pom.xml;ex=target;ex=.*,
-						</argeo.osgi.bundles>
-						<org.osgi.framework.bootdelegation>com.sun.jndi.ldap</org.osgi.framework.bootdelegation>
-					</systemProperties>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<!-- Argeo -->
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.mvc</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.ria</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.json</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-		</dependency>
-
-		<!-- OSGi -->
-		<dependency>
-			<groupId>org.argeo.commons.osgi</groupId>
-			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-		</dependency>
-
-		<!--  Commons Dep -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.tomcat</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.dep.ads</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-
-		<!-- Spring -->
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.extender</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.osgi</groupId>
-			<artifactId>org.springframework.osgi.web.extender</artifactId>
-		</dependency>
-
-		<!-- Used to start the Apache Directory server -->
-		<dependency>
-			<groupId>org.argeo.commons.server</groupId>
-			<artifactId>org.argeo.server.ads</artifactId>
-			<version>0.2.3-SNAPSHOT</version>
-		</dependency>
-
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/security/plugins/org.argeo.security.ui.rcp/build.properties b/security/plugins/org.argeo.security.ui.rcp/build.properties
index ac478ab24..5ac3de985 100644
--- a/security/plugins/org.argeo.security.ui.rcp/build.properties
+++ b/security/plugins/org.argeo.security.ui.rcp/build.properties
@@ -3,5 +3,4 @@ output.. = target/classes/
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               log4j.properties,\
-               jaas_config.txt
+               log4j.properties
diff --git a/security/plugins/org.argeo.security.ui.rcp/plugin.xml b/security/plugins/org.argeo.security.ui.rcp/plugin.xml
index ae0eef408..ce85359e0 100644
--- a/security/plugins/org.argeo.security.ui.rcp/plugin.xml
+++ b/security/plugins/org.argeo.security.ui.rcp/plugin.xml
@@ -8,7 +8,7 @@
          id="org.argeo.security.ui.product"
          point="org.eclipse.core.runtime.products">
       <product
-            name="ArgeoProduct" application="org.argeo.security.ui.application.secureUi">
+            name="ArgeoProduct" application="org.argeo.security.ui.rcp.secureUi">
           <property
                name="appName"
                value="Secure UI">
diff --git a/security/pom.xml b/security/pom.xml
index 8d6d21d42..915b355c0 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -16,6 +16,5 @@
 		<module>plugins</module>
 		<module>dep</module>
 		<module>features</module>
-		<module>demo</module>
 	</modules>
 </project>
\ No newline at end of file
diff --git a/security/runtime/org.argeo.security.activemq/.classpath b/security/runtime/org.argeo.security.activemq/.classpath
index 92f19d2ff..d3d5c8095 100644
--- a/security/runtime/org.argeo.security.activemq/.classpath
+++ b/security/runtime/org.argeo.security.activemq/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/security/runtime/org.argeo.security.core/src/main/resources/org/argeo/security/activemq/osLogin.conf b/security/runtime/org.argeo.security.activemq/src/main/resources/org/argeo/security/activemq/osLogin.conf
similarity index 100%
rename from security/runtime/org.argeo.security.core/src/main/resources/org/argeo/security/activemq/osLogin.conf
rename to security/runtime/org.argeo.security.activemq/src/main/resources/org/argeo/security/activemq/osLogin.conf
diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index e9eca020c..8ffada70e 100644
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -35,6 +35,7 @@
 						<Import-Package>
 							org.springframework.context,
 							org.springframework.beans.factory,
+							org.argeo.jcr,
 							*
 						</Import-Package>
 					</instructions>
-- 
2.30.2