Split assembly for service and cms config
authorbsinou <bsinou@argeo.org>
Tue, 7 Mar 2017 17:53:51 +0000 (18:53 +0100)
committerbsinou <bsinou@argeo.org>
Tue, 7 Mar 2017 17:53:51 +0000 (18:53 +0100)
115 files changed:
org.argeo.suite.app/theme/argeo-classic/img/byArgeo.png [deleted file]
org.argeo.suite.app/theme/argeo-classic/img/logo.jpg [deleted file]
org.argeo.suite.apps.web/.classpath [moved from org.argeo.suite.app/.classpath with 86% similarity]
org.argeo.suite.apps.web/.gitignore [moved from org.argeo.suite.app/.gitignore with 60% similarity]
org.argeo.suite.apps.web/.project [new file with mode: 0644]
org.argeo.suite.apps.web/META-INF/.gitignore [moved from org.argeo.suite.app/META-INF/.gitignore with 100% similarity]
org.argeo.suite.apps.web/META-INF/spring/osgi.xml [new file with mode: 0644]
org.argeo.suite.apps.web/META-INF/spring/ui-commons.xml [moved from org.argeo.suite.app/META-INF/spring/ui-commons.xml with 87% similarity]
org.argeo.suite.apps.web/META-INF/spring/ui-people.xml [moved from org.argeo.suite.app/META-INF/spring/ui-people.xml with 98% similarity]
org.argeo.suite.apps.web/META-INF/spring/ui.xml [moved from org.argeo.suite.app/META-INF/spring/ui.xml with 94% similarity]
org.argeo.suite.apps.web/bnd.bnd [new file with mode: 0644]
org.argeo.suite.apps.web/pom.xml [new file with mode: 0644]
org.argeo.suite.apps.web/theme/argeo-classic/argeo-classic.css [moved from org.argeo.suite.app/theme/argeo-classic/argeo-classic.css with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/documents-classic.css [moved from org.argeo.suite.app/theme/argeo-classic/documents-classic.css with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/actions/deleteSmall.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/actions/deleteSmall.gif with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/actions/openCalendar.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/actions/openCalendar.gif with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/add.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/add.gif with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/dashboard.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/dashboard.gif with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/delete.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/delete.gif with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/favicon.ico [moved from org.argeo.suite.app/theme/argeo-classic/icons/favicon.ico with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/fs/addFolder.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/fs/addFolder.gif with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/fs/bookmarkFolder.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/fs/bookmarkFolder.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/fs/delete.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/fs/delete.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/fs/downloadFolder.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/fs/downloadFolder.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/fs/file.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/fs/file.gif with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/fs/folder.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/fs/folder.gif with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/fs/fsBrowser.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/fs/fsBrowser.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/fs/open.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/fs/open.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/fs/rename.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/fs/rename.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/fs/shareFolder.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/fs/shareFolder.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/fs/upload.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/fs/upload.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/Icon-credit.txt [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/Icon-credit.txt with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/facebook.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/facebook.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/fax.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/fax.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/googleplus.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/googleplus.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/home.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/home.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/impp.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/impp.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/link.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/link.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/linkedin.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/linkedin.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/mail_black.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/mail_black.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/mobile.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/mobile.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/myspace.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/myspace.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/phone_vintage.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/phone_vintage.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/reddit.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/reddit.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/skype.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/skype.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/socialmedia.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/socialmedia.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/telephone.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/telephone.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/twitter.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/twitter.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/contacts/xing.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/contacts/xing.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/misc/primary.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/misc/primary.gif with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/misc/primaryNOT.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/misc/primaryNOT.gif with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/people.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/people.gif with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/types/company.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/types/company.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/people/types/person.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/people/types/person.gif with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/icons/search.png [moved from org.argeo.suite.app/theme/argeo-classic/icons/search.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/img/logo-argeo.png [moved from org.argeo.suite.app/theme/argeo-classic/img/logo-argeo.png with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/maintenance-classic.css [moved from org.argeo.suite.app/theme/argeo-classic/maintenance-classic.css with 100% similarity]
org.argeo.suite.apps.web/theme/argeo-classic/people-classic.css [moved from org.argeo.suite.app/theme/argeo-classic/people-classic.css with 100% similarity]
org.argeo.suite.apps/.classpath [new file with mode: 0644]
org.argeo.suite.apps/.gitignore [new file with mode: 0644]
org.argeo.suite.apps/.project [moved from org.argeo.suite.app/.project with 94% similarity]
org.argeo.suite.apps/META-INF/.gitignore [new file with mode: 0644]
org.argeo.suite.apps/META-INF/spring/backend-services.xml [moved from org.argeo.suite.app/META-INF/spring/backend-services.xml with 100% similarity]
org.argeo.suite.apps/META-INF/spring/maintenance-services.xml [moved from org.argeo.suite.app/META-INF/spring/maintenance-services.xml with 100% similarity]
org.argeo.suite.apps/META-INF/spring/osgi.xml [moved from org.argeo.suite.app/META-INF/spring/osgi.xml with 100% similarity]
org.argeo.suite.apps/META-INF/spring/workbench-services.xml [moved from org.argeo.suite.app/META-INF/spring/workbench-services.xml with 100% similarity]
org.argeo.suite.apps/bnd.bnd [moved from org.argeo.suite.app/bnd.bnd with 100% similarity]
org.argeo.suite.apps/plugin.xml [moved from org.argeo.suite.app/plugin.xml with 100% similarity]
org.argeo.suite.apps/pom.xml [moved from org.argeo.suite.app/pom.xml with 94% similarity]
org.argeo.suite.apps/theme/argeo-classic/icons/actions/add.gif [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/actions/deleteSmall.gif [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/actions/openCalendar.gif [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/dashboard.gif [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/delete.gif [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/favicon.ico [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/fs/addFolder.gif [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/fs/bookmarkFolder.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/fs/delete.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/fs/downloadFolder.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/fs/file.gif [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/fs/folder.gif [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/fs/fsBrowser.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/fs/open.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/fs/rename.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/fs/shareFolder.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/fs/upload.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/maintenance.gif [moved from org.argeo.suite.app/theme/argeo-classic/icons/maintenance.gif with 100% similarity]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/Icon-credit.txt [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/facebook.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/fax.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/googleplus.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/home.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/impp.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/link.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/linkedin.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/mail_black.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/mobile.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/myspace.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/phone_vintage.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/reddit.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/skype.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/socialmedia.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/telephone.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/twitter.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/xing.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/misc/primary.gif [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/misc/primaryNOT.gif [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/people.gif [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/types/company.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/people/types/person.gif [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/icons/search.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/img/logo-argeo.png [new file with mode: 0644]
org.argeo.suite.apps/theme/argeo-classic/workbench-ext.css [moved from org.argeo.suite.app/theme/argeo-classic/workbench-ext.css with 100% similarity]
org.argeo.suite.apps/theme/argeo-classic/workbench-headerExt.css [moved from org.argeo.suite.app/theme/argeo-classic/workbench-headerExt.css with 100% similarity]
pom.xml

diff --git a/org.argeo.suite.app/theme/argeo-classic/img/byArgeo.png b/org.argeo.suite.app/theme/argeo-classic/img/byArgeo.png
deleted file mode 100644 (file)
index 603e3a5..0000000
Binary files a/org.argeo.suite.app/theme/argeo-classic/img/byArgeo.png and /dev/null differ
diff --git a/org.argeo.suite.app/theme/argeo-classic/img/logo.jpg b/org.argeo.suite.app/theme/argeo-classic/img/logo.jpg
deleted file mode 100644 (file)
index 0a2bb68..0000000
Binary files a/org.argeo.suite.app/theme/argeo-classic/img/logo.jpg and /dev/null differ
similarity index 86%
rename from org.argeo.suite.app/.classpath
rename to org.argeo.suite.apps.web/.classpath
index 075009d77450ff8bc131fb1e4741fc35e5e6fd72..dc7ce67ee169a7d08341b2a85f4e813954c362ae 100644 (file)
@@ -2,5 +2,4 @@
 <classpath>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="bin"/>
 </classpath>
similarity index 60%
rename from org.argeo.suite.app/.gitignore
rename to org.argeo.suite.apps.web/.gitignore
index 09e3bc9b241c477ea341af9ee029becad0c2148c..b83d22266ac8aa2f8df2edef68082c789727841d 100644 (file)
@@ -1,2 +1 @@
-/bin/
 /target/
diff --git a/org.argeo.suite.apps.web/.project b/org.argeo.suite.apps.web/.project
new file mode 100644 (file)
index 0000000..542a4e8
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.suite.apps.web</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>
diff --git a/org.argeo.suite.apps.web/META-INF/spring/osgi.xml b/org.argeo.suite.apps.web/META-INF/spring/osgi.xml
new file mode 100644 (file)
index 0000000..85e3a5d
--- /dev/null
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
+       http://www.springframework.org/schema/beans   \r
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+\r
+       <!-- REFERENCES -->\r
+       <reference id="repository" interface="javax.jcr.Repository"\r
+               filter="(cn=home)" />\r
+       <reference id="userAdminService" interface="org.argeo.connect.UserAdminService" />\r
+\r
+       <!-- Maintenance service -->\r
+       <reference id="appMaintenanceService" interface="org.argeo.connect.AppMaintenanceService" />\r
+       <!-- Generic DJ-ing app -->\r
+       <reference id="suiteAppService" interface="org.argeo.connect.AppService" />\r
+       <!-- App specific services -->\r
+       <reference id="resourcesService" interface="org.argeo.connect.resources.ResourcesService" />\r
+       <reference id="activitiesService" interface="org.argeo.activities.ActivitiesService" />\r
+       <reference id="peopleService" interface="org.argeo.people.PeopleService" />\r
+       <reference id="trackerService" interface="org.argeo.tracker.TrackerService" />\r
+       <reference id="documentsService" interface="org.argeo.documents.DocumentsService" />\r
+</beans:beans>\r
similarity index 87%
rename from org.argeo.suite.app/META-INF/spring/ui-commons.xml
rename to org.argeo.suite.apps.web/META-INF/spring/ui-commons.xml
index b74429f1c7b608cc2e28fada0df9a2c88e70e1ab..963836d5ffd7686273a2a71a0d2c6a498fdaa01f 100644 (file)
@@ -32,7 +32,6 @@
        <bean id="headerManager" class="org.argeo.suite.web.DynamicHeader">
                <property name="privateHeaderProvider" ref="privateHeader" />
                <property name="publicHeaderProvider" ref="publicHeader" />
-               <!-- <property name="smallHeaderProvider" ref="smallHeader" /> -->
        </bean>
 
        <bean id="privateHeader" class="org.argeo.cms.util.SimpleCmsHeader">
                                <bean p:label="Dashboard" p:target="/#" parent="menuLink" />
                                <bean p:label="Contacts" p:target="/#/people" parent="menuLink" />
                                <bean p:label="Files" p:target="/#/sharedFiles" parent="menuLink" />
-                               <!-- <bean p:label="Wiki" p:target="/wiki" parent="menuLink" /> -->
                        </list>
                </property>
                <property name="end" ref="headerEnd" />
        </bean>
 
        <bean id="publicHeader" class="org.argeo.cms.util.SimpleCmsHeader">
-               <!-- TODO: add static pages for anonymous view -->
-               <!-- <property name="lead"> -->
-               <!-- <list> -->
-               <!-- </list> -->
-               <!-- </property> -->
                <property name="end" ref="headerEnd" />
        </bean>
 </beans>
similarity index 98%
rename from org.argeo.suite.app/META-INF/spring/ui-people.xml
rename to org.argeo.suite.apps.web/META-INF/spring/ui-people.xml
index aa358672c2186443f4b5c01f763020597f81d3bd..b98be673c141605f673c87eede820851f179be09 100644 (file)
@@ -8,8 +8,9 @@
        <!-- People UI -->
        <bean id="people.mainPage" class="org.argeo.people.web.pages.PeopleDynamicPages">
                <property name="dynamicPages" ref="people.dynamicPages" />
-               <property name="peopleService" ref="peopleService" />
                <property name="resourcesService" ref="resourcesService" />
+               <property name="activitiesService" ref="activitiesService" />
+               <property name="peopleService" ref="peopleService" />
                <property name="iconPathes" ref="peopleEntityIcons" />
        </bean>
 
similarity index 94%
rename from org.argeo.suite.app/META-INF/spring/ui.xml
rename to org.argeo.suite.apps.web/META-INF/spring/ui.xml
index d18645a7d7a8d67015cd1a170a1abdd87362a639..b33ebc79a928c9462d5019300dfd6511612a35f1 100644 (file)
@@ -6,15 +6,13 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
 
        <!-- Main entry point for the CMS -->
-       <bean id="about" parent="app" init-method="init" destroy-method="destroy">
+       <bean id="about" parent="app" init-method="init" destroy-method="destroy" depends-on="appMaintenanceService">
                <property name="workspace" value="main" />
                <property name="header" ref="headerManager" />
                <property name="pages">
                        <map>
                                <entry key="">
                                        <bean class="org.argeo.suite.web.DefaultMainPage">
-                                               <!-- Blocks the initialisation until maintenance service has been initialised. Must be cleaned  -->
-                                               <property name="suiteMaintenanceService" ref="suiteMaintenanceService" />
                                                <property name="peopleService" ref="peopleService" />
                                                <property name="peopleIconPaths" ref="peopleEntityIcons" />
                                                <property name="nodeFileSystemProvider" ref="nodeFileSystemProvider" />
diff --git a/org.argeo.suite.apps.web/bnd.bnd b/org.argeo.suite.apps.web/bnd.bnd
new file mode 100644 (file)
index 0000000..1ec35c5
--- /dev/null
@@ -0,0 +1,16 @@
+Require-Capability: cms.datamodel; filter:="(name=people)",\
+cms.datamodel; filter:="(name=documents)",\
+cms.datamodel; filter:="(name=tracker)"
+
+Import-Package:\
+javax.jcr.nodetype,\
+javax.jcr.security,\
+org.argeo.cms,\
+org.argeo.connect,\
+org.argeo.activities,\
+org.argeo.connect.resources,\
+org.argeo.connect.ui,\
+org.argeo.eclipse.spring,\
+org.argeo.node,\
+org.argeo.util,\
+*
\ No newline at end of file
diff --git a/org.argeo.suite.apps.web/pom.xml b/org.argeo.suite.apps.web/pom.xml
new file mode 100644 (file)
index 0000000..c588933
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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.suite</groupId>
+               <artifactId>argeo-suite</artifactId>
+               <version>0.1.5-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.suite.apps.web</artifactId>
+       <name>Argeo Suite Default CMS</name>
+       <packaging>jar</packaging>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.suite</groupId>
+                       <artifactId>org.argeo.suite.web</artifactId>
+                       <version>0.1.5-SNAPSHOT</version>
+               </dependency>
+       </dependencies>
+</project>
diff --git a/org.argeo.suite.apps/.classpath b/org.argeo.suite.apps/.classpath
new file mode 100644 (file)
index 0000000..dc7ce67
--- /dev/null
@@ -0,0 +1,5 @@
+<?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/JavaSE-1.8"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+</classpath>
diff --git a/org.argeo.suite.apps/.gitignore b/org.argeo.suite.apps/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
@@ -0,0 +1 @@
+/target/
similarity index 94%
rename from org.argeo.suite.app/.project
rename to org.argeo.suite.apps/.project
index fe0dd3fd15bd54259cea595e19bb29894286cad9..d71ff76811f4055b47ce1e20895bf86a313cd293 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>org.argeo.suite.app</name>
+       <name>org.argeo.suite.apps</name>
        <comment></comment>
        <projects>
        </projects>
diff --git a/org.argeo.suite.apps/META-INF/.gitignore b/org.argeo.suite.apps/META-INF/.gitignore
new file mode 100644 (file)
index 0000000..4854a41
--- /dev/null
@@ -0,0 +1 @@
+/MANIFEST.MF
similarity index 94%
rename from org.argeo.suite.app/pom.xml
rename to org.argeo.suite.apps/pom.xml
index 8ce90e6deba9147b7e372f7d34533063b6df0542..a4fe9468276bd3071415766f858753b258daafcf 100644 (file)
@@ -8,7 +8,7 @@
                <version>0.1.5-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
-       <artifactId>org.argeo.suite.app</artifactId>
+       <artifactId>org.argeo.suite.apps</artifactId>
        <name>Argeo Suite Default Assembly</name>
        <packaging>jar</packaging>
        <dependencies>
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/actions/add.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/actions/add.gif
new file mode 100644 (file)
index 0000000..252d7eb
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/actions/add.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/actions/deleteSmall.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/actions/deleteSmall.gif
new file mode 100644 (file)
index 0000000..d7c5c11
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/actions/deleteSmall.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/actions/openCalendar.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/actions/openCalendar.gif
new file mode 100644 (file)
index 0000000..5a89e33
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/actions/openCalendar.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/dashboard.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/dashboard.gif
new file mode 100644 (file)
index 0000000..fd0c669
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/dashboard.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/delete.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/delete.gif
new file mode 100644 (file)
index 0000000..1aca259
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/delete.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/favicon.ico b/org.argeo.suite.apps/theme/argeo-classic/icons/favicon.ico
new file mode 100644 (file)
index 0000000..6e6a050
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/favicon.ico differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/fs/addFolder.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/addFolder.gif
new file mode 100644 (file)
index 0000000..d3f43d9
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/addFolder.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/fs/bookmarkFolder.png b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/bookmarkFolder.png
new file mode 100644 (file)
index 0000000..8bb2361
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/bookmarkFolder.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/fs/delete.png b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/delete.png
new file mode 100644 (file)
index 0000000..9150e40
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/delete.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/fs/downloadFolder.png b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/downloadFolder.png
new file mode 100644 (file)
index 0000000..3f56074
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/downloadFolder.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/fs/file.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/file.gif
new file mode 100644 (file)
index 0000000..ef30288
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/file.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/fs/folder.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/folder.gif
new file mode 100644 (file)
index 0000000..42e027c
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/folder.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/fs/fsBrowser.png b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/fsBrowser.png
new file mode 100644 (file)
index 0000000..3f56074
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/fsBrowser.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/fs/open.png b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/open.png
new file mode 100644 (file)
index 0000000..3836e12
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/open.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/fs/rename.png b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/rename.png
new file mode 100644 (file)
index 0000000..ad3db9f
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/rename.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/fs/shareFolder.png b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/shareFolder.png
new file mode 100644 (file)
index 0000000..269cdac
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/shareFolder.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/fs/upload.png b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/upload.png
new file mode 100644 (file)
index 0000000..71c80e8
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/fs/upload.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/Icon-credit.txt b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/Icon-credit.txt
new file mode 100644 (file)
index 0000000..4e60cf3
--- /dev/null
@@ -0,0 +1,17 @@
+Some of the icons have been downloaded from http://www.fatcow.com/free-icons.
+They are licenced under Creative Commons Attribution 3.0 License.
+
+These icons were as from October 3rd, 2013 the following:
+fax.png
+mail_black.png
+phone-vintage.png
+telephone.png
+
+Some of the icons have been downloaded from http://somerandomdude.com/work/iconic/.
+They are licenced under Creative Commons Attribution 3.0 License.
+
+These icons were as from October 15th, 2013 the following:
+socialmedia.png (former chat_alt_stroke_16x16.png)
+home.png (former home_16x16.png)
+mobile.png (former iphone_12x16.png)
+link.png (former link_16x16.png)
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/facebook.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/facebook.png
new file mode 100644 (file)
index 0000000..8e7e44c
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/facebook.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/fax.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/fax.png
new file mode 100644 (file)
index 0000000..791f511
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/fax.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/googleplus.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/googleplus.png
new file mode 100644 (file)
index 0000000..ff97843
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/googleplus.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/home.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/home.png
new file mode 100644 (file)
index 0000000..16834e3
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/home.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/impp.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/impp.png
new file mode 100644 (file)
index 0000000..b334f91
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/impp.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/link.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/link.png
new file mode 100644 (file)
index 0000000..f223cfa
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/link.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/linkedin.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/linkedin.png
new file mode 100644 (file)
index 0000000..d86dc0e
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/linkedin.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/mail_black.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/mail_black.png
new file mode 100644 (file)
index 0000000..790f750
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/mail_black.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/mobile.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/mobile.png
new file mode 100644 (file)
index 0000000..08ac54b
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/mobile.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/myspace.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/myspace.png
new file mode 100644 (file)
index 0000000..beb04fc
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/myspace.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/phone_vintage.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/phone_vintage.png
new file mode 100644 (file)
index 0000000..7e463ad
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/phone_vintage.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/reddit.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/reddit.png
new file mode 100644 (file)
index 0000000..0eac7b8
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/reddit.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/skype.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/skype.png
new file mode 100644 (file)
index 0000000..e31a04d
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/skype.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/socialmedia.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/socialmedia.png
new file mode 100644 (file)
index 0000000..f0d1722
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/socialmedia.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/telephone.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/telephone.png
new file mode 100644 (file)
index 0000000..e04ec63
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/telephone.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/twitter.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/twitter.png
new file mode 100644 (file)
index 0000000..1023e5b
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/twitter.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/xing.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/xing.png
new file mode 100644 (file)
index 0000000..26fd283
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/contacts/xing.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/misc/primary.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/people/misc/primary.gif
new file mode 100644 (file)
index 0000000..1965b84
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/misc/primary.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/misc/primaryNOT.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/people/misc/primaryNOT.gif
new file mode 100644 (file)
index 0000000..acb0268
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/misc/primaryNOT.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/people.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/people/people.gif
new file mode 100644 (file)
index 0000000..d28c326
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/people.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/types/company.png b/org.argeo.suite.apps/theme/argeo-classic/icons/people/types/company.png
new file mode 100644 (file)
index 0000000..06aa725
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/types/company.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/people/types/person.gif b/org.argeo.suite.apps/theme/argeo-classic/icons/people/types/person.gif
new file mode 100644 (file)
index 0000000..90a0014
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/people/types/person.gif differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/icons/search.png b/org.argeo.suite.apps/theme/argeo-classic/icons/search.png
new file mode 100644 (file)
index 0000000..6588de8
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/icons/search.png differ
diff --git a/org.argeo.suite.apps/theme/argeo-classic/img/logo-argeo.png b/org.argeo.suite.apps/theme/argeo-classic/img/logo-argeo.png
new file mode 100644 (file)
index 0000000..f107230
Binary files /dev/null and b/org.argeo.suite.apps/theme/argeo-classic/img/logo-argeo.png differ
diff --git a/pom.xml b/pom.xml
index 8f83307d18ef0d54c68148073c65ba12bb15e610..46f55759105feddc960518a29f210c0ac3e1b752 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,8 @@
                <module>org.argeo.suite.core</module>
                <module>org.argeo.suite.web</module>
                <module>org.argeo.suite.workbench.rap</module>
-               <module>org.argeo.suite.app</module>
+               <module>org.argeo.suite.apps</module>
+               <module>org.argeo.suite.apps.web</module>
                <module>sdk</module>
        </modules>
        <properties>