Mode demo files

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

diff --git a/osgi/runtime/org.argeo.osgi.boot/pom.xml b/osgi/runtime/org.argeo.osgi.boot/pom.xml
index 80e13a91b3ea0b715a6f9683e74cd5feb0a6b7c5..a35daa9b832a100d4374398d50d21e4497223a26 100644 (file)
--- 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 a284a33775aecf43613d39cb53e5bb9cee30a007..564ae9a0ca2e8f866ecde1bc8988a719cec287a0 100644 (file)
--- 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 (file)
index d0bec0f..0000000
--- 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 (file)
index 85feecb..0000000
--- 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 (file)
index 742857a..0000000
--- 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 (file)
index 004ee66..0000000
--- 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/demo/argeo-node-ui.product b/security/demo/argeo-node-ui.product
new file mode 100644 (file)
index 0000000..9dba055
--- /dev/null
+++ b/security/demo/argeo-node-ui.product
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<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=&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>
+
+   <launcher>
+      <solaris/>
+      <win useIco="false">
+         <bmp/>
+      </win>
+   </launcher>
+
+   <vm>
+   </vm>
+
+   <plugins>
+      <plugin id="com.ibm.icu"/>
+      <plugin id="com.springsource.antlr"/>
+      <plugin id="com.springsource.com.sun.syndication"/>
+      <plugin id="com.springsource.edu.emory.mathcs.backport"/>
+      <plugin id="com.springsource.edu.oswego.cs.dl.util.concurrent"/>
+      <plugin id="com.springsource.javax.mail"/>
+      <plugin id="com.springsource.javax.servlet"/>
+      <plugin id="com.springsource.javax.xml.stream"/>
+      <plugin id="com.springsource.jdbm"/>
+      <plugin id="com.springsource.junit"/>
+      <plugin id="com.springsource.org.aopalliance"/>
+      <plugin id="com.springsource.org.apache.commons.codec"/>
+      <plugin id="com.springsource.org.apache.commons.collections"/>
+      <plugin id="com.springsource.org.apache.commons.compress"/>
+      <plugin id="com.springsource.org.apache.commons.dbcp"/>
+      <plugin id="com.springsource.org.apache.commons.fileupload"/>
+      <plugin id="com.springsource.org.apache.commons.httpclient"/>
+      <plugin id="com.springsource.org.apache.commons.io"/>
+      <plugin id="com.springsource.org.apache.commons.lang"/>
+      <plugin id="com.springsource.org.apache.commons.pool"/>
+      <plugin id="com.springsource.org.apache.directory.server.changepw"/>
+      <plugin id="com.springsource.org.apache.directory.server.core" fragment="true"/>
+      <plugin id="com.springsource.org.apache.directory.server.core.shared"/>
+      <plugin id="com.springsource.org.apache.directory.server.jndi"/>
+      <plugin id="com.springsource.org.apache.directory.server.kerberos"/>
+      <plugin id="com.springsource.org.apache.directory.server.kerberos.shared"/>
+      <plugin id="com.springsource.org.apache.directory.server.ldap"/>
+      <plugin id="com.springsource.org.apache.directory.server.ntp"/>
+      <plugin id="com.springsource.org.apache.directory.server.protocol.shared"/>
+      <plugin id="com.springsource.org.apache.directory.shared.asn1"/>
+      <plugin id="com.springsource.org.apache.directory.shared.ldap"/>
+      <plugin id="com.springsource.org.apache.log4j"/>
+      <plugin id="com.springsource.org.apache.lucene"/>
+      <plugin id="com.springsource.org.apache.mina"/>
+      <plugin id="com.springsource.org.apache.ws.commons.schema"/>
+      <plugin id="com.springsource.org.apache.xalan"/>
+      <plugin id="com.springsource.org.apache.xerces" fragment="true"/>
+      <plugin id="com.springsource.org.apache.xml.resolver"/>
+      <plugin id="com.springsource.org.apache.xml.serializer"/>
+      <plugin id="com.springsource.org.apache.xmlbeans"/>
+      <plugin id="com.springsource.org.apache.xmlcommons"/>
+      <plugin id="com.springsource.org.codehaus.jackson"/>
+      <plugin id="com.springsource.org.codehaus.jackson.mapper"/>
+      <plugin id="com.springsource.org.cyberneko.html"/>
+      <plugin id="com.springsource.org.dom4j"/>
+      <plugin id="com.springsource.org.h2"/>
+      <plugin id="com.springsource.org.jdom"/>
+      <plugin id="com.springsource.org.objectweb.asm"/>
+      <plugin id="com.springsource.org.postgresql.jdbc3"/>
+      <plugin id="com.springsource.slf4j.api"/>
+      <plugin id="com.springsource.slf4j.log4j" fragment="true"/>
+      <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>
+      <plugin id="org.argeo.basic.nodeps"/>
+      <plugin id="org.argeo.dep.osgi.boilerpipe"/>
+      <plugin id="org.argeo.dep.osgi.bouncycastle.jdk15"/>
+      <plugin id="org.argeo.dep.osgi.directory.shared.asn.codec" fragment="true"/>
+      <plugin id="org.argeo.dep.osgi.drewnoakes.metadata_extractor"/>
+      <plugin id="org.argeo.dep.osgi.jackrabbit"/>
+      <plugin id="org.argeo.dep.osgi.jcr"/>
+      <plugin id="org.argeo.dep.osgi.mina.filter.ssl" fragment="true"/>
+      <plugin id="org.argeo.dep.osgi.netcdf"/>
+      <plugin id="org.argeo.dep.osgi.pdfbox"/>
+      <plugin id="org.argeo.dep.osgi.poi"/>
+      <plugin id="org.argeo.dep.osgi.springframework.ldap"/>
+      <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"/>
+      <plugin id="org.argeo.security.jackrabbit" fragment="true"/>
+      <plugin id="org.argeo.security.ldap"/>
+      <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.rcp"/>
+      <plugin id="org.argeo.server.ads"/>
+      <plugin id="org.argeo.server.ads.server"/>
+      <plugin id="org.argeo.server.core"/>
+      <plugin id="org.argeo.server.ext.jackrabbit" fragment="true"/>
+      <plugin id="org.argeo.server.jackrabbit"/>
+      <plugin id="org.argeo.server.jcr"/>
+      <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.eclipse.core.commands"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.databinding"/>
+      <plugin id="org.eclipse.core.databinding.observable"/>
+      <plugin id="org.eclipse.core.databinding.property"/>
+      <plugin id="org.eclipse.core.expressions"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.equinox.security"/>
+      <plugin id="org.eclipse.help"/>
+      <plugin id="org.eclipse.jface"/>
+      <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"/>
+      <plugin id="org.eclipse.ui.forms"/>
+      <plugin id="org.eclipse.ui.workbench"/>
+      <plugin id="org.springframework.aop"/>
+      <plugin id="org.springframework.beans"/>
+      <plugin id="org.springframework.context"/>
+      <plugin id="org.springframework.core"/>
+      <plugin id="org.springframework.osgi.core"/>
+      <plugin id="org.springframework.osgi.extender"/>
+      <plugin id="org.springframework.osgi.io"/>
+      <plugin id="org.springframework.oxm"/>
+      <plugin id="org.springframework.security.core"/>
+      <plugin id="org.springframework.transaction"/>
+      <plugin id="org.springframework.web"/>
+      <plugin id="org.springframework.web.servlet"/>
+      <plugin id="org.springframework.xml"/>
+   </plugins>
+
+   <configurations>
+      <plugin id="org.argeo.node.repo.jackrabbit" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.security.manager.ldap" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.security.services" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.server.ads.server" autoStart="true" startLevel="0" />
+      <plugin id="org.springframework.osgi.extender" autoStart="true" startLevel="0" />
+   </configurations>
+
+</product>

diff --git a/security/demo/log4j.properties b/security/demo/log4j.properties
new file mode 100644 (file)
index 0000000..8a89a4a
--- /dev/null
+++ b/security/demo/log4j.properties
@@ -0,0 +1,24 @@
+log4j.rootLogger=WARN, console
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+log4j.logger.org.springframework.security=DEBUG
+
+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/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 (file)
index 87597b0..0000000
--- 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 (file)
index 87bf4b7..0000000
--- 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 (file)
index df09857..0000000
--- 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 ac478ab24347697379e5b336e4517c38b70a9b8b..5ac3de98545f547e612ce1d17d313b71663913c0 100644 (file)
--- 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/log4j.properties b/security/plugins/org.argeo.security.ui.rcp/log4j.properties
deleted file mode 100644 (file)
index 8a89a4a..0000000
--- a/security/plugins/org.argeo.security.ui.rcp/log4j.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=DEBUG
-log4j.logger.org.springframework.security=DEBUG
-
-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/security/plugins/org.argeo.security.ui.rcp/org.argeo.security.ui.application.product b/security/plugins/org.argeo.security.ui.rcp/org.argeo.security.ui.application.product
deleted file mode 100644 (file)
index 3fabf3a..0000000
--- a/security/plugins/org.argeo.security.ui.rcp/org.argeo.security.ui.application.product
+++ /dev/null
@@ -1,163 +0,0 @@
-<?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">
-
-   <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>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <launcher>
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="com.springsource.antlr"/>
-      <plugin id="com.springsource.com.sun.syndication"/>
-      <plugin id="com.springsource.edu.emory.mathcs.backport"/>
-      <plugin id="com.springsource.edu.oswego.cs.dl.util.concurrent"/>
-      <plugin id="com.springsource.javax.mail"/>
-      <plugin id="com.springsource.javax.servlet"/>
-      <plugin id="com.springsource.javax.xml.stream"/>
-      <plugin id="com.springsource.jdbm"/>
-      <plugin id="com.springsource.junit"/>
-      <plugin id="com.springsource.org.aopalliance"/>
-      <plugin id="com.springsource.org.apache.commons.codec"/>
-      <plugin id="com.springsource.org.apache.commons.collections"/>
-      <plugin id="com.springsource.org.apache.commons.compress"/>
-      <plugin id="com.springsource.org.apache.commons.dbcp"/>
-      <plugin id="com.springsource.org.apache.commons.fileupload"/>
-      <plugin id="com.springsource.org.apache.commons.httpclient"/>
-      <plugin id="com.springsource.org.apache.commons.io"/>
-      <plugin id="com.springsource.org.apache.commons.lang"/>
-      <plugin id="com.springsource.org.apache.commons.pool"/>
-      <plugin id="com.springsource.org.apache.directory.server.changepw"/>
-      <plugin id="com.springsource.org.apache.directory.server.core" fragment="true"/>
-      <plugin id="com.springsource.org.apache.directory.server.core.shared"/>
-      <plugin id="com.springsource.org.apache.directory.server.jndi"/>
-      <plugin id="com.springsource.org.apache.directory.server.kerberos"/>
-      <plugin id="com.springsource.org.apache.directory.server.kerberos.shared"/>
-      <plugin id="com.springsource.org.apache.directory.server.ldap"/>
-      <plugin id="com.springsource.org.apache.directory.server.ntp"/>
-      <plugin id="com.springsource.org.apache.directory.server.protocol.shared"/>
-      <plugin id="com.springsource.org.apache.directory.shared.asn1"/>
-      <plugin id="com.springsource.org.apache.directory.shared.ldap"/>
-      <plugin id="com.springsource.org.apache.log4j"/>
-      <plugin id="com.springsource.org.apache.lucene"/>
-      <plugin id="com.springsource.org.apache.mina"/>
-      <plugin id="com.springsource.org.apache.ws.commons.schema"/>
-      <plugin id="com.springsource.org.apache.xalan"/>
-      <plugin id="com.springsource.org.apache.xerces" fragment="true"/>
-      <plugin id="com.springsource.org.apache.xml.resolver"/>
-      <plugin id="com.springsource.org.apache.xml.serializer"/>
-      <plugin id="com.springsource.org.apache.xmlbeans"/>
-      <plugin id="com.springsource.org.apache.xmlcommons"/>
-      <plugin id="com.springsource.org.codehaus.jackson"/>
-      <plugin id="com.springsource.org.codehaus.jackson.mapper"/>
-      <plugin id="com.springsource.org.cyberneko.html"/>
-      <plugin id="com.springsource.org.dom4j"/>
-      <plugin id="com.springsource.org.h2"/>
-      <plugin id="com.springsource.org.jdom"/>
-      <plugin id="com.springsource.org.objectweb.asm"/>
-      <plugin id="com.springsource.org.postgresql.jdbc3"/>
-      <plugin id="com.springsource.slf4j.api"/>
-      <plugin id="com.springsource.slf4j.log4j" fragment="true"/>
-      <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>
-      <plugin id="org.argeo.basic.nodeps"/>
-      <plugin id="org.argeo.dep.osgi.boilerpipe"/>
-      <plugin id="org.argeo.dep.osgi.bouncycastle.jdk15"/>
-      <plugin id="org.argeo.dep.osgi.directory.shared.asn.codec" fragment="true"/>
-      <plugin id="org.argeo.dep.osgi.drewnoakes.metadata_extractor"/>
-      <plugin id="org.argeo.dep.osgi.jackrabbit"/>
-      <plugin id="org.argeo.dep.osgi.jcr"/>
-      <plugin id="org.argeo.dep.osgi.mina.filter.ssl" fragment="true"/>
-      <plugin id="org.argeo.dep.osgi.netcdf"/>
-      <plugin id="org.argeo.dep.osgi.pdfbox"/>
-      <plugin id="org.argeo.dep.osgi.poi"/>
-      <plugin id="org.argeo.dep.osgi.springframework.ldap"/>
-      <plugin id="org.argeo.dep.osgi.tagsoup"/>
-      <plugin id="org.argeo.dep.osgi.tika"/>
-      <plugin id="org.argeo.eclipse.ui"/>
-      <plugin id="org.argeo.infra.core"/>
-      <plugin id="org.argeo.infra.security.services" fragment="true"/>
-      <plugin id="org.argeo.node.repo.jackrabbit"/>
-      <plugin id="org.argeo.security.core"/>
-      <plugin id="org.argeo.security.equinox"/>
-      <plugin id="org.argeo.security.jackrabbit" fragment="true"/>
-      <plugin id="org.argeo.security.ldap"/>
-      <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.server.ads"/>
-      <plugin id="org.argeo.server.ads.server"/>
-      <plugin id="org.argeo.server.core"/>
-      <plugin id="org.argeo.server.ext.jackrabbit" fragment="true"/>
-      <plugin id="org.argeo.server.jackrabbit"/>
-      <plugin id="org.argeo.server.jcr"/>
-      <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"/>
-      <plugin id="org.eclipse.core.databinding.observable"/>
-      <plugin id="org.eclipse.core.databinding.property"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.equinox.security"/>
-      <plugin id="org.eclipse.help"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.swt"/>
-      <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"/>
-      <plugin id="org.eclipse.ui.forms"/>
-      <plugin id="org.eclipse.ui.workbench"/>
-      <plugin id="org.springframework.aop"/>
-      <plugin id="org.springframework.beans"/>
-      <plugin id="org.springframework.context"/>
-      <plugin id="org.springframework.core"/>
-      <plugin id="org.springframework.osgi.core"/>
-      <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"/>
-      <plugin id="org.springframework.web.servlet"/>
-      <plugin id="org.springframework.xml"/>
-   </plugins>
-
-   <configurations>
-      <plugin id="org.argeo.node.repo.jackrabbit" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.security.manager.ldap" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.security.services" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.server.ads.server" autoStart="true" startLevel="0" />
-      <plugin id="org.springframework.osgi.extender" autoStart="true" startLevel="0" />
-   </configurations>
-
-</product>

diff --git a/security/plugins/org.argeo.security.ui.rcp/plugin.xml b/security/plugins/org.argeo.security.ui.rcp/plugin.xml
index ae0eef408a814251427da4357a2e2b3b7a17eb56..ce85359e0682d749242b7caf04c7d11fb69d92f8 100644 (file)
--- 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 8d6d21d427ae389585f6da44299663d7ac046adc..915b355c0ce983d8ce2e3a1d375a543f06e6532b 100644 (file)
--- 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 92f19d2ff95b83a87f5210157582c70bb070ed48..d3d5c80958677f1f8de5b580c289b3baf7c5452c 100644 (file)
--- 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.activemq/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
new file mode 100644 (file)
index 0000000..17df63c
--- /dev/null
+++ b/security/runtime/org.argeo.security.activemq/src/main/resources/org/argeo/security/activemq/osLogin.conf
@@ -0,0 +1,12 @@
+Unix {
+  com.sun.security.auth.module.UnixLoginModule required;
+};
+
+Solaris {
+  com.sun.security.auth.module.SolarisLoginModule required;
+};
+
+Windows {
+  com.sun.security.auth.module.NTLoginModule required;
+};
+

diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index e9eca020c13a2b9b2554a876ebe5b8726a86ad80..8ffada70e5d6526c445692e785589c31c8382cb2 100644 (file)
--- 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>

diff --git a/security/runtime/org.argeo.security.core/src/main/resources/org/argeo/security/activemq/osLogin.conf b/security/runtime/org.argeo.security.core/src/main/resources/org/argeo/security/activemq/osLogin.conf
deleted file mode 100644 (file)
index 17df63c..0000000
--- a/security/runtime/org.argeo.security.core/src/main/resources/org/argeo/security/activemq/osLogin.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-Unix {
-  com.sun.security.auth.module.UnixLoginModule required;
-};
-
-Solaris {
-  com.sun.security.auth.module.SolarisLoginModule required;
-};
-
-Windows {
-  com.sun.security.auth.module.NTLoginModule required;
-};
-