OSGi related POMs

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

diff --git a/demo/org.argeo.slc.demo.basic/.settings/org.eclipse.jdt.core.prefs b/demo/org.argeo.slc.demo.basic/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..52560ee
--- /dev/null
+++ b/demo/org.argeo.slc.demo.basic/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Mon Feb 23 12:46:02 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/demo/org.argeo.slc.demo.basic/.settings/org.springframework.ide.eclipse.core.prefs b/demo/org.argeo.slc.demo.basic/.settings/org.springframework.ide.eclipse.core.prefs
new file mode 100644 (file)
index 0000000..52534ea
--- /dev/null
+++ b/demo/org.argeo.slc.demo.basic/.settings/org.springframework.ide.eclipse.core.prefs
@@ -0,0 +1,19 @@
+#Mon Feb 23 10:19:09 CET 2009
+eclipse.preferences.version=1
+org.springframework.ide.eclipse.core.builders.enable.beanmetadatabuilder=false
+org.springframework.ide.eclipse.core.enable.project.preferences=false
+org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=false

diff --git a/demo/org.argeo.slc.demo.manager/.settings/org.eclipse.jdt.core.prefs b/demo/org.argeo.slc.demo.manager/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..23ab29a
--- /dev/null
+++ b/demo/org.argeo.slc.demo.manager/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Tue Feb 24 17:26:20 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/demo/org.argeo.slc.demo.manager/.settings/org.springframework.ide.eclipse.beans.core.prefs b/demo/org.argeo.slc.demo.manager/.settings/org.springframework.ide.eclipse.beans.core.prefs
new file mode 100644 (file)
index 0000000..47103a3
--- /dev/null
+++ b/demo/org.argeo.slc.demo.manager/.settings/org.springframework.ide.eclipse.beans.core.prefs
@@ -0,0 +1,3 @@
+#Tue Feb 24 17:23:36 CET 2009
+eclipse.preferences.version=1
+org.springframework.ide.eclipse.beans.core.ignoreMissingNamespaceHandler=false

diff --git a/demo/org.argeo.slc.demo.manager/.settings/org.springframework.ide.eclipse.core.prefs b/demo/org.argeo.slc.demo.manager/.settings/org.springframework.ide.eclipse.core.prefs
new file mode 100644 (file)
index 0000000..a88b4c7
--- /dev/null
+++ b/demo/org.argeo.slc.demo.manager/.settings/org.springframework.ide.eclipse.core.prefs
@@ -0,0 +1,19 @@
+#Tue Feb 24 17:23:36 CET 2009
+eclipse.preferences.version=1
+org.springframework.ide.eclipse.core.builders.enable.beanmetadatabuilder=false
+org.springframework.ide.eclipse.core.enable.project.preferences=false
+org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=false

diff --git a/demo/pom.xml b/demo/pom.xml
new file mode 100644 (file)
index 0000000..e3aabf9
--- /dev/null
+++ b/demo/pom.xml
@@ -0,0 +1,21 @@
+<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>argeo-slc</artifactId>
+               <version>0.11.3-SNAPSHOT</version>
+               <relativePath>../org.argeo.slc</relativePath>
+       </parent>
+       <artifactId>argeo-slc-demo</artifactId>
+       <packaging>pom</packaging>
+       <name>Argeo SLC Demo</name>
+       <modules>
+               <module>org.argeo.slc.demo.basic</module>
+               <module>org.argeo.slc.demo.manager</module>
+               <module>org.argeo.slc.demo.log4j</module>
+       </modules>
+       <build>
+               <plugins>
+               </plugins>
+       </build>
+</project>

diff --git a/pom.xml b/pom.xml
index 9cd4a6106142eac6412de03f09cb45dd9041fb65..1629f03f0a309aa598dfd40a009bd2262888c1b9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
        <modules>
                <module>org.argeo.slc</module>
                <module>runtime</module>
+               <module>demo</module>
 
                <module>org.argeo.slc.detached.launcher</module>
                <module>org.argeo.slc.webapp</module>
@@ -44,7 +45,7 @@
                <profile>
                        <id>fullBuild</id>
                        <modules>
-                               <module>eclipse/features/org.argeo.slc.ui.launch.feature</module>
+                               <!--<module>eclipse/features/org.argeo.slc.ui.launch.feature</module>-->
                                <module>examples</module>
                                <module>integration-tests</module>
                        </modules>

diff --git a/runtime/org.argeo.slc.server/.settings/org.springframework.ide.eclipse.core.prefs b/runtime/org.argeo.slc.server/.settings/org.springframework.ide.eclipse.core.prefs
new file mode 100644 (file)
index 0000000..b93b9bd
--- /dev/null
+++ b/runtime/org.argeo.slc.server/.settings/org.springframework.ide.eclipse.core.prefs
@@ -0,0 +1,19 @@
+#Sun Jan 11 18:26:20 CET 2009
+eclipse.preferences.version=1
+org.springframework.ide.eclipse.core.builders.enable.beanmetadatabuilder=false
+org.springframework.ide.eclipse.core.enable.project.preferences=false
+org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=true
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false
+org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=false

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 1711f629128434fdf82c7619cec167a748c0f796..3e9aa450c21dbdefe305d46b7fb9994083baa9b6 100644 (file)
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -15,6 +15,7 @@
                <module>org.argeo.slc.support.castor</module>
                <module>org.argeo.slc.support.activemq</module>
                <module>org.argeo.slc.support.ant</module>
+               <module>org.argeo.slc.support.equinox</module>
                <module>org.argeo.slc.support.ws.client</module>
                <module>org.argeo.slc.support.hibernate</module>
                <module>org.argeo.slc.server</module>

diff --git a/sandbox/argeo.slc.executionflow/pom.xml b/sandbox/argeo.slc.executionflow/pom.xml
index b10baff1ba574e19a032e50dcb2ce8fae0f2138b..f275ad4060d8db2de3c1412322dbe88934b53aa0 100644 (file)
--- a/sandbox/argeo.slc.executionflow/pom.xml
+++ b/sandbox/argeo.slc.executionflow/pom.xml
@@ -34,10 +34,6 @@
        <dependencies>
 
 
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.execution</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>

diff --git a/sandbox/argeo.slc.executionflow/src/slc/conf/basic.xml b/sandbox/argeo.slc.executionflow/src/slc/conf/basic.xml
index c2077f50f448c5bdfe65eadc2ccfdc40969e39ca..aa51467792e28a8120caa3f3cb381a6c773a7f57 100644 (file)
--- a/sandbox/argeo.slc.executionflow/src/slc/conf/basic.xml
+++ b/sandbox/argeo.slc.executionflow/src/slc/conf/basic.xml
@@ -7,7 +7,7 @@
        http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
 \r
-       <bean id="basic.executionSpec" class="org.argeo.slc.execution.SimpleExecutionSpec">\r
+       <bean id="basic.executionSpec" class="org.argeo.slc.core.execution.SimpleExecutionSpec">\r
                <property name="attributes">\r
                        <map>\r
                                <entry key="testedComponentId">\r
@@ -26,7 +26,7 @@
        <bean id="basic.ref" factory-bean="basic.executionSpec"\r
                factory-method="createRef" abstract="true" />\r
 \r
-       <bean id="basic.executionFlowTemplate" class="org.argeo.slc.execution.SimpleExecutionFlow"\r
+       <bean id="basic.executionFlowTemplate" class="org.argeo.slc.core.execution.SimpleExecutionFlow"\r
                abstract="true">\r
                <property name="executionSpec" ref="basic.executionSpec" />\r
                <property name="executables">\r

diff --git a/sandbox/argeo.slc.executionflow/src/slc/conf/common.xml b/sandbox/argeo.slc.executionflow/src/slc/conf/common.xml
index 4495b2f83e2ca49035c389826be0cc76d46f6c6a..4ed1362f732e651ee405ef568a56a57322af2b34 100644 (file)
--- a/sandbox/argeo.slc.executionflow/src/slc/conf/common.xml
+++ b/sandbox/argeo.slc.executionflow/src/slc/conf/common.xml
@@ -10,10 +10,10 @@
        <import\r
                resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
 \r
-       <bean id="specAttribute" class="org.argeo.slc.execution.SimpleSpecAttribute"\r
+       <bean id="specAttribute" class="org.argeo.slc.core.execution.SimpleSpecAttribute"\r
                abstract="true" />\r
 \r
-       <bean id="refAttribute" class="org.argeo.slc.execution.RefSpecAttribute"\r
+       <bean id="refAttribute" class="org.argeo.slc.core.execution.RefSpecAttribute"\r
                abstract="true" />\r
 \r
 </beans>
\ No newline at end of file

diff --git a/sandbox/argeo.slc.executionflow/src/slc/conf/main.xml b/sandbox/argeo.slc.executionflow/src/slc/conf/main.xml
index aab3785e2eb6ebc5f1f2caa6a07308550487bace..cd577729fc5a4987981fafe112483159fce44259 100644 (file)
--- a/sandbox/argeo.slc.executionflow/src/slc/conf/main.xml
+++ b/sandbox/argeo.slc.executionflow/src/slc/conf/main.xml
@@ -14,12 +14,12 @@
        <import resource="testCases/basic-001.xml" />\r
        <import resource="testCases/basic-002.xml" />\r
 \r
-       <bean id="testLaunch" class="org.argeo.slc.execution.TestLaunch"\r
+       <bean id="testLaunch" class="org.argeo.slc.execution.old.TestLaunch"\r
                p:flowName="main" init-method="launch"/>\r
 \r
-       <bean id="main" class="org.argeo.slc.execution.SimpleExecutionFlow">\r
+       <bean id="main" class="org.argeo.slc.core.execution.SimpleExecutionFlow">\r
                <property name="executionSpec">\r
-                       <bean class="org.argeo.slc.execution.SimpleExecutionSpec">\r
+                       <bean class="org.argeo.slc.core.execution.SimpleExecutionSpec">\r
                                <property name="attributes">\r
                                        <map>\r
                                                <entry key="testKey">\r
@@ -45,7 +45,7 @@
                <aop:scoped-proxy />\r
        </bean>\r
 \r
-       <bean id="echoTemplate" class="org.argeo.slc.execution.tasks.Echo"\r
+       <bean id="echoTemplate" class="org.argeo.slc.core.execution.tasks.Echo"\r
                abstract="true">\r
        </bean>\r
 \r
@@ -57,7 +57,7 @@
                <property name="scopes">\r
                        <map>\r
                                <entry key="execution">\r
-                                       <bean class="org.argeo.slc.execution.ExecutionScope" />\r
+                                       <bean class="org.argeo.slc.core.execution.ExecutionScope" />\r
                                </entry>\r
                        </map>\r
                </property>\r
@@ -65,11 +65,11 @@
 \r
        <bean\r
                class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />\r
-       <bean class="org.argeo.slc.execution.ExecutionParameterPostProcessor" />\r
-       <bean class="org.argeo.slc.execution.InstantiationPostProcessor" />\r
-       <bean class="org.argeo.slc.execution.Executor" />\r
+       <bean class="org.argeo.slc.core.execution.ExecutionParameterPostProcessor" />\r
+       <bean class="org.argeo.slc.core.execution.InstantiationPostProcessor" />\r
+       <bean class="org.argeo.slc.core.execution.Executor" />\r
 \r
-       <bean class="org.argeo.slc.execution.ExecutionAspect"></bean>\r
+       <bean class="org.argeo.slc.core.execution.ExecutionAspect"></bean>\r
        <aop:aspectj-autoproxy />\r
 \r
 </beans>
\ No newline at end of file

diff --git a/server/org.argeo.slc.siteserver/.settings/org.eclipse.jdt.core.prefs b/server/org.argeo.slc.siteserver/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..2257df4
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+#Tue Jan 13 14:40:01 CET 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/server/org.argeo.slc.siteserver/.settings/org.maven.ide.eclipse.prefs b/server/org.argeo.slc.siteserver/.settings/org.maven.ide.eclipse.prefs
new file mode 100644 (file)
index 0000000..bba96e7
--- /dev/null
+++ b/server/org.argeo.slc.siteserver/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Tue Jan 13 14:40:01 CET 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+version=1