CMS target platforms

diff --git a/sdk/argeo-suite-rcp.properties b/sdk/argeo-suite-rcp.properties
index 4cc7c87dbdfd33a5e5085071a13100f6d0837f42..a2d3be795d356c0d9b4bc6c01f11e9d121d48063 100644 (file)
--- a/sdk/argeo-suite-rcp.properties
+++ b/sdk/argeo-suite-rcp.properties
@@ -2,18 +2,26 @@ argeo.osgi.start.2.node=\
 org.eclipse.equinox.http.servlet,\
 org.eclipse.equinox.metatype,\
 org.eclipse.equinox.cm,\
-org.eclipse.rap.rwt.osgi
+org.eclipse.rap.rwt.osgi,\
+org.argeo.init
 
 argeo.osgi.start.2.suite=\
 org.apache.tika.parsers
 
 argeo.osgi.start.3.node=\
-org.argeo.cms
+org.argeo.cms,\
+org.argeo.cms.jcr,\
+org.argeo.cms.ui.rcp
 
 argeo.osgi.start.5.suite=\
-org.argeo.suite.ui,\
-org.argeo.suite.theme.default,\
-org.argeo.cms.ui.rcp
+org.argeo.app.core,\
+org.argeo.app.ui,\
+org.argeo.app.theme.default,\
+
+argeo.osgi.start.6.suite=\
+org.argeo.app.servlet.publish,\
+org.argeo.app.servlet.odk
+
 
 # Local
 argeo.node.repo.type=h2
@@ -30,7 +38,7 @@ argeo.i18n.defaultLocale=en
 #tika.config=/home/mbaudier/dev/git/gpl/argeo-suite/sdk/exec/argeo-office-e4-rap/data/indexes/node/tika-config.xml
 
 # Logging
-log4j.configuration=file:../../log4j.properties
+log.org.argeo=DEBUG
 
 # DON'T CHANGE BELOW
 org.eclipse.equinox.http.jetty.autostart=false

diff --git a/sdk/osgi.mk b/sdk/osgi.mk
index a97a937f82f0b5186ea4752e337f2138ce45e478..25491f518ac61868229d528e368a8ca05bfb4193 100644 (file)
--- a/sdk/osgi.mk
+++ b/sdk/osgi.mk
@@ -35,7 +35,7 @@ $(BUILD_BASE)/cnf/%.bnd: cnf/%.bnd
        mkdir -p $(dir $@)
        cp $< $@
        
-$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%.jar
+$(A2_OUTPUT)/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%.jar
        mkdir -p $(dir $@)
        cp $< $@
 

diff --git a/sdk/output-cms-rap.target b/sdk/output-cms-rap.target
new file mode 100644 (file)
index 0000000..d2db7a9
--- /dev/null
+++ b/sdk/output-cms-rap.target
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="(output) CMS RAP">
+       <locations>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms.rap" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+       </locations>
+</target>
\ No newline at end of file

diff --git a/sdk/output-cms-rcp.target b/sdk/output-cms-rcp.target
new file mode 100644 (file)
index 0000000..b480838
--- /dev/null
+++ b/sdk/output-cms-rcp.target
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="(output) CMS RCP">
+       <locations>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms.rcp" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+       </locations>
+</target>
\ No newline at end of file