From 79bc665d4b1eeccb7416279750bc60a138c81988 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 25 Nov 2014 13:35:45 +0000 Subject: [PATCH] New project conventions git-svn-id: https://svn.argeo.org/commons/trunk@7534 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.security.auth.ldap/bnd.bnd | 5 +++ org.argeo.security.auth.ldap/pom.xml | 19 ---------- org.argeo.security.dao.cli/bnd.bnd | 1 + org.argeo.security.dao.cli/pom.xml | 16 --------- org.argeo.security.dao.jackrabbit/bnd.bnd | 0 org.argeo.security.dao.jackrabbit/pom.xml | 8 ----- org.argeo.security.dao.ldap/bnd.bnd | 5 +++ org.argeo.security.dao.ldap/pom.xml | 19 ---------- org.argeo.security.dao.os/bnd.bnd | 1 + org.argeo.security.dao.os/pom.xml | 16 --------- org.argeo.server.core/.classpath | 10 +++--- org.argeo.server.core/bnd.bnd | 3 ++ org.argeo.server.core/build.properties | 2 +- org.argeo.server.core/pom.xml | 33 ------------------ .../org/argeo/server/BooleanAnswer.java | 0 .../org/argeo/server/Deserializer.java | 0 .../org/argeo/server/DeserializingEditor.java | 0 .../org/argeo/server/PrimitiveAnswer.java | 0 .../org/argeo/server/Serializer.java | 0 .../org/argeo/server/ServerAnswer.java | 0 .../org/argeo/server/ServerSerializer.java | 0 .../server/backup/AbstractAtomicBackup.java | 0 .../org/argeo/server/backup/AtomicBackup.java | 0 .../argeo/server/backup/BackupContext.java | 0 .../backup/BackupFileSystemManager.java | 0 .../org/argeo/server/backup/BackupPurge.java | 0 .../org/argeo/server/backup/BackupUtils.java | 0 .../org/argeo/server/backup/MySqlBackup.java | 0 .../argeo/server/backup/OpenLdapBackup.java | 0 .../org/argeo/server/backup/OsCallBackup.java | 0 .../argeo/server/backup/PostgreSqlBackup.java | 0 .../server/backup/SimpleBackupContext.java | 0 .../server/backup/SimpleBackupPurge.java | 0 .../org/argeo/server/backup/SvnBackup.java | 0 .../org/argeo/server/backup/SystemBackup.java | 0 .../server/dao/AbstractMemoryDaoSupport.java | 0 .../server/dao/AbstractTabularDaoSupport.java | 0 .../org/argeo/server/dao/LightDaoAware.java | 0 .../server/dao/LightDaoPropertyEditor.java | 0 .../org/argeo/server/dao/LightDaoSupport.java | 0 .../mvc/DefaultHandlerExceptionResolver.java | 0 .../argeo/server/mvc/EmptyViewController.java | 0 .../org/argeo/server/mvc/MvcConstants.java | 0 .../org/argeo/server/mvc/SerializingView.java | 0 .../server/mvc/SerializingViewResolver.java | 0 org.argeo.server.jcr.mvc/.classpath | 10 +++--- ...ndlerMapping$DelegatingServletConfig.class | Bin 0 -> 1548 bytes .../MultipleRepositoryHandlerMapping.class | Bin 0 -> 5169 bytes .../argeo/jcr/mvc/ResourceProxyServlet.class | Bin 0 -> 5863 bytes org.argeo.server.jcr.mvc/bnd.bnd | 7 ++++ org.argeo.server.jcr.mvc/build.properties | 5 +-- .../mvc/MultipleRepositoryHandlerMapping.java | 0 .../argeo/jcr/mvc/ResourceProxyServlet.java | 0 53 files changed, 36 insertions(+), 124 deletions(-) create mode 100644 org.argeo.security.auth.ldap/bnd.bnd create mode 100644 org.argeo.security.dao.cli/bnd.bnd create mode 100644 org.argeo.security.dao.jackrabbit/bnd.bnd create mode 100644 org.argeo.security.dao.ldap/bnd.bnd create mode 100644 org.argeo.security.dao.os/bnd.bnd create mode 100644 org.argeo.server.core/bnd.bnd rename org.argeo.server.core/src/{main/java => }/org/argeo/server/BooleanAnswer.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/Deserializer.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/DeserializingEditor.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/PrimitiveAnswer.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/Serializer.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/ServerAnswer.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/ServerSerializer.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/AbstractAtomicBackup.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/AtomicBackup.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/BackupContext.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/BackupFileSystemManager.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/BackupPurge.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/BackupUtils.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/MySqlBackup.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/OpenLdapBackup.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/OsCallBackup.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/PostgreSqlBackup.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/SimpleBackupContext.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/SimpleBackupPurge.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/SvnBackup.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/backup/SystemBackup.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/dao/AbstractMemoryDaoSupport.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/dao/AbstractTabularDaoSupport.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/dao/LightDaoAware.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/dao/LightDaoPropertyEditor.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/dao/LightDaoSupport.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/mvc/DefaultHandlerExceptionResolver.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/mvc/EmptyViewController.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/mvc/MvcConstants.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/mvc/SerializingView.java (100%) rename org.argeo.server.core/src/{main/java => }/org/argeo/server/mvc/SerializingViewResolver.java (100%) create mode 100644 org.argeo.server.jcr.mvc/bin/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping$DelegatingServletConfig.class create mode 100644 org.argeo.server.jcr.mvc/bin/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping.class create mode 100644 org.argeo.server.jcr.mvc/bin/org/argeo/jcr/mvc/ResourceProxyServlet.class create mode 100644 org.argeo.server.jcr.mvc/bnd.bnd rename org.argeo.server.jcr.mvc/src/{main/java => }/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping.java (100%) rename org.argeo.server.jcr.mvc/src/{main/java => }/org/argeo/jcr/mvc/ResourceProxyServlet.java (100%) diff --git a/org.argeo.security.auth.ldap/bnd.bnd b/org.argeo.security.auth.ldap/bnd.bnd new file mode 100644 index 000000000..85e0e5c66 --- /dev/null +++ b/org.argeo.security.auth.ldap/bnd.bnd @@ -0,0 +1,5 @@ +Import-Package: org.argeo.jcr,\ +com.sun.jndi.ldap;resolution:=optional,\ +org.springframework.ldap.core.support,\ +org.springframework.security,\ +* \ No newline at end of file diff --git a/org.argeo.security.auth.ldap/pom.xml b/org.argeo.security.auth.ldap/pom.xml index a4410a91f..c26dda86d 100644 --- a/org.argeo.security.auth.ldap/pom.xml +++ b/org.argeo.security.auth.ldap/pom.xml @@ -8,23 +8,4 @@ org.argeo.security.auth.ldap Commons Security Auth LDAP - - - - org.apache.felix - maven-bundle-plugin - - - - *, - org.argeo.jcr, - com.sun.jndi.ldap;resolution:=optional, - org.springframework.ldap.core.support, - org.springframework.security - - - - - - \ No newline at end of file diff --git a/org.argeo.security.dao.cli/bnd.bnd b/org.argeo.security.dao.cli/bnd.bnd new file mode 100644 index 000000000..0df3b4a65 --- /dev/null +++ b/org.argeo.security.dao.cli/bnd.bnd @@ -0,0 +1 @@ +Import-Package: org.argeo.jcr,* \ No newline at end of file diff --git a/org.argeo.security.dao.cli/pom.xml b/org.argeo.security.dao.cli/pom.xml index c354eacbd..553edb019 100644 --- a/org.argeo.security.dao.cli/pom.xml +++ b/org.argeo.security.dao.cli/pom.xml @@ -8,20 +8,4 @@ org.argeo.security.dao.cli Commons Security DAO CLI - - - - org.apache.felix - maven-bundle-plugin - - - - *, - org.argeo.jcr, - - - - - - \ No newline at end of file diff --git a/org.argeo.security.dao.jackrabbit/bnd.bnd b/org.argeo.security.dao.jackrabbit/bnd.bnd new file mode 100644 index 000000000..e69de29bb diff --git a/org.argeo.security.dao.jackrabbit/pom.xml b/org.argeo.security.dao.jackrabbit/pom.xml index 86f837e6a..2c7027e26 100644 --- a/org.argeo.security.dao.jackrabbit/pom.xml +++ b/org.argeo.security.dao.jackrabbit/pom.xml @@ -8,12 +8,4 @@ org.argeo.security.dao.jackrabbit Commons Security DAO Jackrabbit - - - - org.apache.felix - maven-bundle-plugin - - - \ No newline at end of file diff --git a/org.argeo.security.dao.ldap/bnd.bnd b/org.argeo.security.dao.ldap/bnd.bnd new file mode 100644 index 000000000..85e0e5c66 --- /dev/null +++ b/org.argeo.security.dao.ldap/bnd.bnd @@ -0,0 +1,5 @@ +Import-Package: org.argeo.jcr,\ +com.sun.jndi.ldap;resolution:=optional,\ +org.springframework.ldap.core.support,\ +org.springframework.security,\ +* \ No newline at end of file diff --git a/org.argeo.security.dao.ldap/pom.xml b/org.argeo.security.dao.ldap/pom.xml index d4ca96c6b..bb2482f43 100644 --- a/org.argeo.security.dao.ldap/pom.xml +++ b/org.argeo.security.dao.ldap/pom.xml @@ -8,23 +8,4 @@ org.argeo.security.dao.ldap Commons Security DAO LDAP - - - - org.apache.felix - maven-bundle-plugin - - - - *, - org.argeo.jcr, - com.sun.jndi.ldap;resolution:=optional, - org.springframework.ldap.core.support, - org.springframework.security - - - - - - \ No newline at end of file diff --git a/org.argeo.security.dao.os/bnd.bnd b/org.argeo.security.dao.os/bnd.bnd new file mode 100644 index 000000000..0df3b4a65 --- /dev/null +++ b/org.argeo.security.dao.os/bnd.bnd @@ -0,0 +1 @@ +Import-Package: org.argeo.jcr,* \ No newline at end of file diff --git a/org.argeo.security.dao.os/pom.xml b/org.argeo.security.dao.os/pom.xml index 7ec6fe6c3..05ee4ccd4 100644 --- a/org.argeo.security.dao.os/pom.xml +++ b/org.argeo.security.dao.os/pom.xml @@ -8,20 +8,4 @@ org.argeo.security.dao.os Commons Security DAO OS - - - - org.apache.felix - maven-bundle-plugin - - - - *, - org.argeo.jcr, - - - - - - \ No newline at end of file diff --git a/org.argeo.server.core/.classpath b/org.argeo.server.core/.classpath index 3bf3adef5..d2953a684 100644 --- a/org.argeo.server.core/.classpath +++ b/org.argeo.server.core/.classpath @@ -1,7 +1,9 @@ - - >> - - + + + + diff --git a/org.argeo.server.core/bnd.bnd b/org.argeo.server.core/bnd.bnd new file mode 100644 index 000000000..8a56d16ed --- /dev/null +++ b/org.argeo.server.core/bnd.bnd @@ -0,0 +1,3 @@ +Import-Package: javax.servlet,\ +org.springframework.web.context,\ +* \ No newline at end of file diff --git a/org.argeo.server.core/build.properties b/org.argeo.server.core/build.properties index 92847ec08..da395131a 100644 --- a/org.argeo.server.core/build.properties +++ b/org.argeo.server.core/build.properties @@ -1,4 +1,4 @@ -source.. = src/main/java/ +source.. = src/ additional.bundles = slf4j.api,\ slf4j.org.apache.commons.logging,\ slf4j.log4j,\ diff --git a/org.argeo.server.core/pom.xml b/org.argeo.server.core/pom.xml index f8a23d5a2..386f179b6 100644 --- a/org.argeo.server.core/pom.xml +++ b/org.argeo.server.core/pom.xml @@ -9,39 +9,6 @@ org.argeo.server.core Commons Server Core - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-source-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.felix - maven-bundle-plugin - - - - - org.argeo.server.* - - - javax.servlet, - org.springframework.web.context, - * - - - - - - org.argeo.commons diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/BooleanAnswer.java b/org.argeo.server.core/src/org/argeo/server/BooleanAnswer.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/BooleanAnswer.java rename to org.argeo.server.core/src/org/argeo/server/BooleanAnswer.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/Deserializer.java b/org.argeo.server.core/src/org/argeo/server/Deserializer.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/Deserializer.java rename to org.argeo.server.core/src/org/argeo/server/Deserializer.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/DeserializingEditor.java b/org.argeo.server.core/src/org/argeo/server/DeserializingEditor.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/DeserializingEditor.java rename to org.argeo.server.core/src/org/argeo/server/DeserializingEditor.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/PrimitiveAnswer.java b/org.argeo.server.core/src/org/argeo/server/PrimitiveAnswer.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/PrimitiveAnswer.java rename to org.argeo.server.core/src/org/argeo/server/PrimitiveAnswer.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/Serializer.java b/org.argeo.server.core/src/org/argeo/server/Serializer.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/Serializer.java rename to org.argeo.server.core/src/org/argeo/server/Serializer.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/ServerAnswer.java b/org.argeo.server.core/src/org/argeo/server/ServerAnswer.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/ServerAnswer.java rename to org.argeo.server.core/src/org/argeo/server/ServerAnswer.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/ServerSerializer.java b/org.argeo.server.core/src/org/argeo/server/ServerSerializer.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/ServerSerializer.java rename to org.argeo.server.core/src/org/argeo/server/ServerSerializer.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/AbstractAtomicBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/AbstractAtomicBackup.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/AbstractAtomicBackup.java rename to org.argeo.server.core/src/org/argeo/server/backup/AbstractAtomicBackup.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/AtomicBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/AtomicBackup.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/AtomicBackup.java rename to org.argeo.server.core/src/org/argeo/server/backup/AtomicBackup.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupContext.java b/org.argeo.server.core/src/org/argeo/server/backup/BackupContext.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupContext.java rename to org.argeo.server.core/src/org/argeo/server/backup/BackupContext.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupFileSystemManager.java b/org.argeo.server.core/src/org/argeo/server/backup/BackupFileSystemManager.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupFileSystemManager.java rename to org.argeo.server.core/src/org/argeo/server/backup/BackupFileSystemManager.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupPurge.java b/org.argeo.server.core/src/org/argeo/server/backup/BackupPurge.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupPurge.java rename to org.argeo.server.core/src/org/argeo/server/backup/BackupPurge.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupUtils.java b/org.argeo.server.core/src/org/argeo/server/backup/BackupUtils.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/BackupUtils.java rename to org.argeo.server.core/src/org/argeo/server/backup/BackupUtils.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/MySqlBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/MySqlBackup.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/MySqlBackup.java rename to org.argeo.server.core/src/org/argeo/server/backup/MySqlBackup.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/OpenLdapBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/OpenLdapBackup.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/OpenLdapBackup.java rename to org.argeo.server.core/src/org/argeo/server/backup/OpenLdapBackup.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/OsCallBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/OsCallBackup.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/OsCallBackup.java rename to org.argeo.server.core/src/org/argeo/server/backup/OsCallBackup.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/PostgreSqlBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/PostgreSqlBackup.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/PostgreSqlBackup.java rename to org.argeo.server.core/src/org/argeo/server/backup/PostgreSqlBackup.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/SimpleBackupContext.java b/org.argeo.server.core/src/org/argeo/server/backup/SimpleBackupContext.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/SimpleBackupContext.java rename to org.argeo.server.core/src/org/argeo/server/backup/SimpleBackupContext.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/SimpleBackupPurge.java b/org.argeo.server.core/src/org/argeo/server/backup/SimpleBackupPurge.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/SimpleBackupPurge.java rename to org.argeo.server.core/src/org/argeo/server/backup/SimpleBackupPurge.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/SvnBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/SvnBackup.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/SvnBackup.java rename to org.argeo.server.core/src/org/argeo/server/backup/SvnBackup.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/backup/SystemBackup.java b/org.argeo.server.core/src/org/argeo/server/backup/SystemBackup.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/backup/SystemBackup.java rename to org.argeo.server.core/src/org/argeo/server/backup/SystemBackup.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java b/org.argeo.server.core/src/org/argeo/server/dao/AbstractMemoryDaoSupport.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractMemoryDaoSupport.java rename to org.argeo.server.core/src/org/argeo/server/dao/AbstractMemoryDaoSupport.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractTabularDaoSupport.java b/org.argeo.server.core/src/org/argeo/server/dao/AbstractTabularDaoSupport.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/dao/AbstractTabularDaoSupport.java rename to org.argeo.server.core/src/org/argeo/server/dao/AbstractTabularDaoSupport.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoAware.java b/org.argeo.server.core/src/org/argeo/server/dao/LightDaoAware.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoAware.java rename to org.argeo.server.core/src/org/argeo/server/dao/LightDaoAware.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoPropertyEditor.java b/org.argeo.server.core/src/org/argeo/server/dao/LightDaoPropertyEditor.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoPropertyEditor.java rename to org.argeo.server.core/src/org/argeo/server/dao/LightDaoPropertyEditor.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoSupport.java b/org.argeo.server.core/src/org/argeo/server/dao/LightDaoSupport.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/dao/LightDaoSupport.java rename to org.argeo.server.core/src/org/argeo/server/dao/LightDaoSupport.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/mvc/DefaultHandlerExceptionResolver.java b/org.argeo.server.core/src/org/argeo/server/mvc/DefaultHandlerExceptionResolver.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/mvc/DefaultHandlerExceptionResolver.java rename to org.argeo.server.core/src/org/argeo/server/mvc/DefaultHandlerExceptionResolver.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/mvc/EmptyViewController.java b/org.argeo.server.core/src/org/argeo/server/mvc/EmptyViewController.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/mvc/EmptyViewController.java rename to org.argeo.server.core/src/org/argeo/server/mvc/EmptyViewController.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/mvc/MvcConstants.java b/org.argeo.server.core/src/org/argeo/server/mvc/MvcConstants.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/mvc/MvcConstants.java rename to org.argeo.server.core/src/org/argeo/server/mvc/MvcConstants.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java b/org.argeo.server.core/src/org/argeo/server/mvc/SerializingView.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java rename to org.argeo.server.core/src/org/argeo/server/mvc/SerializingView.java diff --git a/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingViewResolver.java b/org.argeo.server.core/src/org/argeo/server/mvc/SerializingViewResolver.java similarity index 100% rename from org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingViewResolver.java rename to org.argeo.server.core/src/org/argeo/server/mvc/SerializingViewResolver.java diff --git a/org.argeo.server.jcr.mvc/.classpath b/org.argeo.server.jcr.mvc/.classpath index c5931a083..d2953a684 100644 --- a/org.argeo.server.jcr.mvc/.classpath +++ b/org.argeo.server.jcr.mvc/.classpath @@ -1,7 +1,9 @@ - >> - - - + + + + diff --git a/org.argeo.server.jcr.mvc/bin/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping$DelegatingServletConfig.class b/org.argeo.server.jcr.mvc/bin/org/argeo/jcr/mvc/MultipleRepositoryHandlerMapping$DelegatingServletConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..086b9fac4e3f875d1ee9581d94cd9294f0723da2 GIT binary patch literal 1548 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 literal 0 HcmV?d00001 diff --git a/org.argeo.server.jcr.mvc/bin/org/argeo/jcr/mvc/ResourceProxyServlet.class b/org.argeo.server.jcr.mvc/bin/org/argeo/jcr/mvc/ResourceProxyServlet.class new file mode 100644 index 0000000000000000000000000000000000000000..d1dc1dbd8bd3bd3aa19b6c4aadd5f68321bedf17 GIT binary patch literal 5863 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