From 057d80065bad948930426f87b9a2eb1d4cab3e14 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 24 Feb 2011 11:49:55 +0000 Subject: [PATCH] Restructure Jackrabbit modules git-svn-id: https://svn.argeo.org/commons/trunk@4185 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../.project | 2 +- .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/spring/jackrabbit-osgi.xml | 0 .../META-INF/spring/jackrabbit.xml | 0 .../build.properties | 0 .../localrepo.properties | 0 .../repository-h2.xml | 0 .../repository-postgresql.xml | 0 .../.project | 2 +- .../.settings/org.eclipse.pde.core.prefs | 0 .../META-INF/MANIFEST.MF | 4 ++-- .../WEB-INF/applicationContext.xml | 0 .../WEB-INF/osgi.xml | 0 .../WEB-INF/remoting-servlet.xml | 0 .../WEB-INF/security.xml | 0 .../WEB-INF/web.xml | 0 .../build.properties | 0 18 files changed, 6 insertions(+), 6 deletions(-) rename server/modules/{org.argeo.server.jackrabbit.repo => org.argeo.jackrabbit.localrepo}/.project (90%) rename server/modules/{org.argeo.server.jackrabbit.repo => org.argeo.jackrabbit.localrepo}/.settings/org.eclipse.pde.core.prefs (100%) rename server/modules/{org.argeo.server.jackrabbit.repo => org.argeo.jackrabbit.localrepo}/META-INF/MANIFEST.MF (76%) rename server/modules/{org.argeo.server.jackrabbit.repo => org.argeo.jackrabbit.localrepo}/META-INF/spring/jackrabbit-osgi.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.repo => org.argeo.jackrabbit.localrepo}/META-INF/spring/jackrabbit.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.repo => org.argeo.jackrabbit.localrepo}/build.properties (100%) rename server/modules/{org.argeo.server.jackrabbit.repo => org.argeo.jackrabbit.localrepo}/localrepo.properties (100%) rename server/modules/{org.argeo.server.jackrabbit.repo => org.argeo.jackrabbit.localrepo}/repository-h2.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.repo => org.argeo.jackrabbit.localrepo}/repository-postgresql.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.webapp.war => org.argeo.jackrabbit.webapp}/.project (90%) rename server/modules/{org.argeo.server.jackrabbit.webapp.war => org.argeo.jackrabbit.webapp}/.settings/org.eclipse.pde.core.prefs (100%) rename server/modules/{org.argeo.server.jackrabbit.webapp.war => org.argeo.jackrabbit.webapp}/META-INF/MANIFEST.MF (85%) rename server/modules/{org.argeo.server.jackrabbit.webapp.war => org.argeo.jackrabbit.webapp}/WEB-INF/applicationContext.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.webapp.war => org.argeo.jackrabbit.webapp}/WEB-INF/osgi.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.webapp.war => org.argeo.jackrabbit.webapp}/WEB-INF/remoting-servlet.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.webapp.war => org.argeo.jackrabbit.webapp}/WEB-INF/security.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.webapp.war => org.argeo.jackrabbit.webapp}/WEB-INF/web.xml (100%) rename server/modules/{org.argeo.server.jackrabbit.webapp.war => org.argeo.jackrabbit.webapp}/build.properties (100%) diff --git a/server/modules/org.argeo.server.jackrabbit.repo/.project b/server/modules/org.argeo.jackrabbit.localrepo/.project similarity index 90% rename from server/modules/org.argeo.server.jackrabbit.repo/.project rename to server/modules/org.argeo.jackrabbit.localrepo/.project index 695beebdd..87b35f8a3 100644 --- a/server/modules/org.argeo.server.jackrabbit.repo/.project +++ b/server/modules/org.argeo.jackrabbit.localrepo/.project @@ -1,6 +1,6 @@ - org.argeo.server.jackrabbit.repo + org.argeo.jackrabbit.localrepo diff --git a/server/modules/org.argeo.server.jackrabbit.repo/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.jackrabbit.localrepo/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.repo/.settings/org.eclipse.pde.core.prefs rename to server/modules/org.argeo.jackrabbit.localrepo/.settings/org.eclipse.pde.core.prefs diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF b/server/modules/org.argeo.jackrabbit.localrepo/META-INF/MANIFEST.MF similarity index 76% rename from server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF rename to server/modules/org.argeo.jackrabbit.localrepo/META-INF/MANIFEST.MF index a7181d1b7..9e035e21b 100644 --- a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.jackrabbit.localrepo/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Repo -Bundle-SymbolicName: org.argeo.server.jackrabbit.repo +Bundle-Name: Jackrabbit Local Repository +Bundle-SymbolicName: org.argeo.jackrabbit.localrepo Bundle-Version: 0.2.3.SNAPSHOT Import-Package: javax.jcr, org.apache.jackrabbit.core, diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit-osgi.xml b/server/modules/org.argeo.jackrabbit.localrepo/META-INF/spring/jackrabbit-osgi.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit-osgi.xml rename to server/modules/org.argeo.jackrabbit.localrepo/META-INF/spring/jackrabbit-osgi.xml diff --git a/server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml b/server/modules/org.argeo.jackrabbit.localrepo/META-INF/spring/jackrabbit.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.repo/META-INF/spring/jackrabbit.xml rename to server/modules/org.argeo.jackrabbit.localrepo/META-INF/spring/jackrabbit.xml diff --git a/server/modules/org.argeo.server.jackrabbit.repo/build.properties b/server/modules/org.argeo.jackrabbit.localrepo/build.properties similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.repo/build.properties rename to server/modules/org.argeo.jackrabbit.localrepo/build.properties diff --git a/server/modules/org.argeo.server.jackrabbit.repo/localrepo.properties b/server/modules/org.argeo.jackrabbit.localrepo/localrepo.properties similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.repo/localrepo.properties rename to server/modules/org.argeo.jackrabbit.localrepo/localrepo.properties diff --git a/server/modules/org.argeo.server.jackrabbit.repo/repository-h2.xml b/server/modules/org.argeo.jackrabbit.localrepo/repository-h2.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.repo/repository-h2.xml rename to server/modules/org.argeo.jackrabbit.localrepo/repository-h2.xml diff --git a/server/modules/org.argeo.server.jackrabbit.repo/repository-postgresql.xml b/server/modules/org.argeo.jackrabbit.localrepo/repository-postgresql.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.repo/repository-postgresql.xml rename to server/modules/org.argeo.jackrabbit.localrepo/repository-postgresql.xml diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/.project b/server/modules/org.argeo.jackrabbit.webapp/.project similarity index 90% rename from server/modules/org.argeo.server.jackrabbit.webapp.war/.project rename to server/modules/org.argeo.jackrabbit.webapp/.project index b3972fb62..37eed0584 100644 --- a/server/modules/org.argeo.server.jackrabbit.webapp.war/.project +++ b/server/modules/org.argeo.jackrabbit.webapp/.project @@ -1,6 +1,6 @@ - org.argeo.server.jackrabbit.webapp + org.argeo.jackrabbit.webapp diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/.settings/org.eclipse.pde.core.prefs b/server/modules/org.argeo.jackrabbit.webapp/.settings/org.eclipse.pde.core.prefs similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.webapp.war/.settings/org.eclipse.pde.core.prefs rename to server/modules/org.argeo.jackrabbit.webapp/.settings/org.eclipse.pde.core.prefs diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF b/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF similarity index 85% rename from server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF rename to server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF index 76c2ee11a..2122086ea 100644 --- a/server/modules/org.argeo.server.jackrabbit.webapp.war/META-INF/MANIFEST.MF +++ b/server/modules/org.argeo.jackrabbit.webapp/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Webapp -Bundle-SymbolicName: org.argeo.server.jackrabbit.webapp +Bundle-SymbolicName: org.argeo.jackrabbit.webapp Bundle-Version: 1.0.0.qualifier -Web-ContextPath: org.argeo.server.jcr.webapp +Web-ContextPath: org.argeo.jcr.webapp Bundle-Vendor: Argeo Import-Package: javax.jcr, javax.servlet, diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/applicationContext.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/applicationContext.xml rename to server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/osgi.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/osgi.xml rename to server/modules/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/remoting-servlet.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/remoting-servlet.xml rename to server/modules/org.argeo.jackrabbit.webapp/WEB-INF/remoting-servlet.xml diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/security.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/security.xml rename to server/modules/org.argeo.jackrabbit.webapp/WEB-INF/security.xml diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/web.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.webapp.war/WEB-INF/web.xml rename to server/modules/org.argeo.jackrabbit.webapp/WEB-INF/web.xml diff --git a/server/modules/org.argeo.server.jackrabbit.webapp.war/build.properties b/server/modules/org.argeo.jackrabbit.webapp/build.properties similarity index 100% rename from server/modules/org.argeo.server.jackrabbit.webapp.war/build.properties rename to server/modules/org.argeo.jackrabbit.webapp/build.properties -- 2.39.2