Adapt to changes in Argeo Commons

diff --git a/cms/org.argeo.cms.integration/pom.xml b/cms/org.argeo.cms.integration/pom.xml
index 82dc5f84ce69ae7e33b3fc74294b70afd779a7b8..cba3edeb27debfc7438cca34857bc6e9939625d2 100644 (file)
--- a/cms/org.argeo.cms.integration/pom.xml
+++ b/cms/org.argeo.cms.integration/pom.xml
@@ -14,6 +14,11 @@
                        <artifactId>org.argeo.cms</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.cms.servlet</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.jcr</artifactId>

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java
index 321796d96f61de543a6ec9ac1be689ed585d4530..ad976b114a8dad6b0622b3c77b3d8bb19602123c 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java
@@ -20,6 +20,8 @@ import org.argeo.api.NodeConstants;
 import org.argeo.api.cms.CmsSessionId;
 import org.argeo.cms.auth.HttpRequestCallback;
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
+import org.argeo.cms.servlet.ServletHttpRequest;
+import org.argeo.cms.servlet.ServletHttpResponse;
 import org.osgi.service.useradmin.Authorization;
 
 import com.fasterxml.jackson.core.JsonGenerator;
@@ -40,11 +42,12 @@ public class CmsLoginServlet extends HttpServlet {
        }
 
        @Override
-       protected void doPost(HttpServletRequest request, HttpServletResponse response)
-                       throws ServletException, IOException {
+       protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
                LoginContext lc = null;
-               String username = request.getParameter(PARAM_USERNAME);
-               String password = request.getParameter(PARAM_PASSWORD);
+               String username = req.getParameter(PARAM_USERNAME);
+               String password = req.getParameter(PARAM_PASSWORD);
+               ServletHttpRequest request = new ServletHttpRequest(req);
+               ServletHttpResponse response = new ServletHttpResponse(resp);
                try {
                        lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new HttpRequestCallbackHandler(request, response) {
                                public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
@@ -65,7 +68,7 @@ public class CmsLoginServlet extends HttpServlet {
                        Subject subject = lc.getSubject();
                        CmsSessionId cmsSessionId = extractFrom(subject.getPrivateCredentials(CmsSessionId.class));
                        if (cmsSessionId == null) {
-                               response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+                               resp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
                                return;
                        }
                        Authorization authorization = extractFrom(subject.getPrivateCredentials(Authorization.class));
@@ -75,15 +78,15 @@ public class CmsLoginServlet extends HttpServlet {
                                        cmsSessionId.getUuid().toString(), authorization.getRoles(), authorization.toString(),
                                        locale != null ? locale.toString() : null);
 
-                       response.setContentType("application/json");
-                       JsonGenerator jg = objectMapper.getFactory().createGenerator(response.getWriter());
+                       resp.setContentType("application/json");
+                       JsonGenerator jg = objectMapper.getFactory().createGenerator(resp.getWriter());
                        jg.writeObject(cmsSessionDescriptor);
 
-                       String redirectTo = redirectTo(request);
+                       String redirectTo = redirectTo(req);
                        if (redirectTo != null)
-                               response.sendRedirect(redirectTo);
+                               resp.sendRedirect(redirectTo);
                } catch (LoginException e) {
-                       response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+                       resp.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
                        return;
                }
        }

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java
index 0821dab40b5875275734206ee8d33f175afb9549..461953790b3cbe02297bd9ddbe9d3202d712d51f 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java
@@ -18,6 +18,8 @@ import org.argeo.api.cms.CmsSessionId;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.HttpRequestCallback;
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
+import org.argeo.cms.servlet.ServletHttpRequest;
+import org.argeo.cms.servlet.ServletHttpResponse;
 
 /** Externally authenticate an http session. */
 public class CmsLogoutServlet extends HttpServlet {
@@ -32,18 +34,21 @@ public class CmsLogoutServlet extends HttpServlet {
        @Override
        protected void doPost(HttpServletRequest request, HttpServletResponse response)
                        throws ServletException, IOException {
+               ServletHttpRequest httpRequest = new ServletHttpRequest(request);
+               ServletHttpResponse httpResponse = new ServletHttpResponse(response);
                LoginContext lc = null;
                try {
-                       lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new HttpRequestCallbackHandler(request, response) {
-                               public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-                                       for (Callback callback : callbacks) {
-                                               if (callback instanceof HttpRequestCallback) {
-                                                       ((HttpRequestCallback) callback).setRequest(request);
-                                                       ((HttpRequestCallback) callback).setResponse(response);
+                       lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER,
+                                       new HttpRequestCallbackHandler(httpRequest, httpResponse) {
+                                               public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+                                                       for (Callback callback : callbacks) {
+                                                               if (callback instanceof HttpRequestCallback) {
+                                                                       ((HttpRequestCallback) callback).setRequest(httpRequest);
+                                                                       ((HttpRequestCallback) callback).setResponse(httpResponse);
+                                                               }
+                                                       }
                                                }
-                                       }
-                               }
-                       });
+                                       });
                        lc.login();
 
                        Subject subject = lc.getSubject();

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java
index 862d7ee08eda8eab931b31a8c65d987df28e27ac..be45fba1cce72a969bee4a86368f36ef85acc66c 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java
@@ -15,6 +15,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
 import org.argeo.cms.servlet.ServletAuthUtils;
+import org.argeo.cms.servlet.ServletHttpRequest;
+import org.argeo.cms.servlet.ServletHttpResponse;
 import org.osgi.service.http.context.ServletContextHelper;
 
 /** Manages security access to servlets. */
@@ -34,18 +36,20 @@ public class CmsPrivateServletContext extends ServletContextHelper {
         * the login page.
         */
        @Override
-       public boolean handleSecurity(final HttpServletRequest request, HttpServletResponse response) throws IOException {
+       public boolean handleSecurity(final HttpServletRequest req, HttpServletResponse resp) throws IOException {
                LoginContext lc = null;
+               ServletHttpRequest request = new ServletHttpRequest(req);
+               ServletHttpResponse response = new ServletHttpResponse(resp);
 
-               String pathInfo = request.getPathInfo();
-               String servletPath = request.getServletPath();
+               String pathInfo = req.getPathInfo();
+               String servletPath = req.getServletPath();
                if ((pathInfo != null && (servletPath + pathInfo).equals(loginPage)) || servletPath.contentEquals(loginServlet))
                        return true;
                try {
                        lc = new LoginContext(LOGIN_CONTEXT_USER, new HttpRequestCallbackHandler(request, response));
                        lc.login();
                } catch (LoginException e) {
-                       lc = processUnauthorized(request, response);
+                       lc = processUnauthorized(req, resp);
                        if (lc == null)
                                return false;
                }
@@ -64,8 +68,8 @@ public class CmsPrivateServletContext extends ServletContextHelper {
        }
 
        @Override
-       public void finishSecurity(HttpServletRequest request, HttpServletResponse response) {
-               ServletAuthUtils.clearRequestSecurity(request);
+       public void finishSecurity(HttpServletRequest req, HttpServletResponse resp) {
+               ServletAuthUtils.clearRequestSecurity(new ServletHttpRequest(req));
        }
 
        protected LoginContext processUnauthorized(HttpServletRequest request, HttpServletResponse response) {

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java
index 11a6944b29efc2fc739d3dc52e653e193fb4f55b..274e0ed49b30c3eae89fc0d703fa7339975f1ab7 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java
@@ -19,6 +19,8 @@ import org.argeo.api.NodeConstants;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.auth.HttpRequestCallback;
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
+import org.argeo.cms.servlet.ServletHttpRequest;
+import org.argeo.cms.servlet.ServletHttpResponse;
 import org.argeo.naming.NamingUtils;
 import org.osgi.service.useradmin.Authorization;
 
@@ -38,8 +40,9 @@ public class CmsTokenServlet extends HttpServlet {
        private ObjectMapper objectMapper = new ObjectMapper();
 
        @Override
-       protected void doPost(HttpServletRequest request, HttpServletResponse response)
-                       throws ServletException, IOException {
+       protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+               ServletHttpRequest request = new ServletHttpRequest(req);
+               ServletHttpResponse response = new ServletHttpResponse(resp);
                LoginContext lc = null;
                try {
                        lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new HttpRequestCallbackHandler(request, response) {
@@ -61,7 +64,7 @@ public class CmsTokenServlet extends HttpServlet {
                        Subject subject = lc.getSubject();
                        Authorization authorization = extractFrom(subject.getPrivateCredentials(Authorization.class));
                        String token = UUID.randomUUID().toString();
-                       String expiryDateStr = request.getParameter(PARAM_EXPIRY_DATE);
+                       String expiryDateStr = req.getParameter(PARAM_EXPIRY_DATE);
                        ZonedDateTime expiryDate;
                        if (expiryDateStr != null) {
                                expiryDate = NamingUtils.ldapDateToZonedDateTime(expiryDateStr);
@@ -77,11 +80,11 @@ public class CmsTokenServlet extends HttpServlet {
                        tokenDescriptor.setExpiryDate(expiryDateStr);
 //                     tokenDescriptor.setRoles(Collections.unmodifiableSortedSet(new TreeSet<>(Arrays.asList(roles))));
 
-                       response.setContentType("application/json");
-                       JsonGenerator jg = objectMapper.getFactory().createGenerator(response.getWriter());
+                       resp.setContentType("application/json");
+                       JsonGenerator jg = objectMapper.getFactory().createGenerator(resp.getWriter());
                        jg.writeObject(tokenDescriptor);
                } catch (Exception e) {
-                       new CmsExceptionsChain(e).writeAsJson(objectMapper, response);
+                       new CmsExceptionsChain(e).writeAsJson(objectMapper, resp);
                }
        }
 

diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java
index 298e8ec27f8d96ca7660c78d041d85d873e39af3..fc100e0e46475fdff2b085974229a64eb45e6c44 100644 (file)
--- a/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java
+++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java
@@ -6,7 +6,6 @@ import java.util.List;
 
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
-import javax.servlet.http.HttpSession;
 import javax.websocket.Extension;
 import javax.websocket.HandshakeResponse;
 import javax.websocket.server.HandshakeRequest;
@@ -17,6 +16,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.api.NodeConstants;
 import org.argeo.cms.auth.HttpRequestCallbackHandler;
+import org.argeo.cms.auth.HttpSession;
+import org.argeo.cms.servlet.ServletHttpSession;
 import org.osgi.service.http.context.ServletContextHelper;
 
 /** Customises the initialisation of a new web socket. */
@@ -62,7 +63,8 @@ public class CmsWebSocketConfigurator extends Configurator {
 
        @Override
        public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request, HandshakeResponse response) {
-               HttpSession httpSession = (HttpSession) request.getHttpSession();
+
+               HttpSession httpSession = new ServletHttpSession((javax.servlet.http.HttpSession) request.getHttpSession());
                if (log.isDebugEnabled() && httpSession != null)
                        log.debug("Web socket HTTP session id: " + httpSession.getId());
 
@@ -112,4 +114,3 @@ public class CmsWebSocketConfigurator extends Configurator {
 //     webServerConfig.put(InternalHttpConstants.WEBSOCKET_ENABLED, "true");
 //}
 //}
-

diff --git a/dep/org.argeo.slc.dep.e4.rap/pom.xml b/dep/org.argeo.slc.dep.e4.rap/pom.xml
index e8d2e7d3d5718b99e4cd99f184d1d45de2fb85fa..6edae26e4eef3e970f297ce93e4078c6d44e7c6b 100644 (file)
--- a/dep/org.argeo.slc.dep.e4.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.e4.rap/pom.xml
@@ -23,16 +23,6 @@
                        <type>pom</type>
                </dependency>
 
-
-               <!-- OSGi Boot for platform generation only, as it could be used by regular 
-                       Java applications to launch an OSGi runtime. -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>${version.argeo-commons}</version>
-                       <scope>test</scope>
-               </dependency>
-
                <!-- ALM Third Parties -->
                <!-- <dependency> -->
                <!-- <groupId>org.argeo.tp.apache.ant</groupId> -->

diff --git a/dep/pom.xml b/dep/pom.xml
index c463f27cdfe7e1ed4ea1e047324461938acab394..8ed99e2ef6d7ca1a955839edbec304f58a7c5f7c 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -98,7 +98,7 @@
                        <dependencies>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
-                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <artifactId>org.argeo.init</artifactId>
                                        <version>${version.argeo-commons}</version>
                                        <scope>test</scope>
                                </dependency>

diff --git a/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml b/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
index a188f909da36c3ea9e79833e7af7bd30644d304e..950b4bed2c8d253b6bc0ecdcd3631ca50ac8766c 100644 (file)
--- a/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/legacy/argeo-commons/dep/org.argeo.dep.cms.platform/pom.xml
@@ -48,7 +48,7 @@
 <!--                   <version>${version.argeo-commons}</version> -->
 <!--           </dependency> -->
                <dependency>
-                       <groupId>org.argeo.commons</groupId>
+                       <groupId>org.argeo.commons.rap</groupId>
                        <artifactId>org.argeo.swt.specific.rap</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>

diff --git a/legacy/argeo-commons/dep/pom.xml b/legacy/argeo-commons/dep/pom.xml
index 088cdae6b9ff7f83aa8b0a39315f1da78eca6cf0..52b49de38fb2d0db7bf91c5a9b7c3e3c6178970a 100644 (file)
--- a/legacy/argeo-commons/dep/pom.xml
+++ b/legacy/argeo-commons/dep/pom.xml
@@ -93,7 +93,7 @@
                        <dependencies>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
-                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <artifactId>org.argeo.init</artifactId>
                                        <version>${version.argeo-commons}</version>
                                        <scope>test</scope>
                                </dependency>

diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
index 1708a023980ab1cc884203f63d52b0f382ffbc30..9e7235bd2da6806bd44c25653941a970308c9789 100644 (file)
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/pom.xml
@@ -18,7 +18,7 @@
                </dependency>
                <!-- RAP specific -->
                <dependency>
-                       <groupId>org.argeo.commons</groupId>
+                       <groupId>org.argeo.commons.rap</groupId>
                        <artifactId>org.argeo.swt.specific.rap</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>

diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml b/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
index 0bcfa6c79dfbb6e1a941d5dcfa949070e9ba4482..ee4c0c12c34e5decace82a827145f69d9a5f5f95 100644 (file)
--- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
+++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/pom.xml
@@ -18,7 +18,7 @@
                </dependency>
 
                <dependency>
-                       <groupId>org.argeo.commons</groupId>
+                       <groupId>org.argeo.commons.rap</groupId>
                        <artifactId>org.argeo.swt.specific.rap</artifactId>
                        <version>${version.argeo-commons}</version>
                        <scope>provided</scope>

diff --git a/legacy/dep/org.argeo.slc.dep.backend/pom.xml b/legacy/dep/org.argeo.slc.dep.backend/pom.xml
index 3e60b553e19aedf97f22b8cb476678c995c5406d..288df6e6e97ac18fa5ebfe6b451c6d45bfc91186 100644 (file)
--- a/legacy/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/legacy/dep/org.argeo.slc.dep.backend/pom.xml
@@ -64,15 +64,6 @@
                        <version>2.3-SNAPSHOT</version>
                </dependency>
 
-               <!-- OSGi Boot for platform generation only, as it could be used by regular 
-                       Java applications to launch an OSGi runtime. -->
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>${version.argeo-commons}</version>
-                       <scope>test</scope>
-               </dependency>
-
                <!-- Legacy Argeo Commons platform (Eclipse 3) -->
                <dependency>
                        <groupId>org.argeo.slc.legacy.commons</groupId>

diff --git a/legacy/dep/pom.xml b/legacy/dep/pom.xml
index affcea4a4677cb8541e6227f0c40964e4308a7c6..e4ffb87f1b8deefbee4b542f532a99d613848eaf 100644 (file)
--- a/legacy/dep/pom.xml
+++ b/legacy/dep/pom.xml
@@ -98,7 +98,7 @@
                        <dependencies>
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
-                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <artifactId>org.argeo.init</artifactId>
                                        <version>${version.argeo-commons}</version>
                                        <scope>test</scope>
                                </dependency>

diff --git a/legacy/org.argeo.slc.client.ui.dist/pom.xml b/legacy/org.argeo.slc.client.ui.dist/pom.xml
index 81598ed8b85312ffe1e26e0b44834e1831d4acba..9019fb6082d3732da3fbb4c18907f85386a98886 100644 (file)
--- a/legacy/org.argeo.slc.client.ui.dist/pom.xml
+++ b/legacy/org.argeo.slc.client.ui.dist/pom.xml
@@ -18,7 +18,7 @@
                        <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons</groupId>
+                       <groupId>org.argeo.commons.rap</groupId>
                        <artifactId>org.argeo.swt.specific.rap</artifactId>
                        <version>${version.argeo-commons}</version>
                        <scope>provided</scope>

diff --git a/legacy/org.argeo.slc.client.ui/pom.xml b/legacy/org.argeo.slc.client.ui/pom.xml
index be65f6959ee937fe3cce139b0473251801687e3d..107863d4e25a03a17f1d5975f87399d4b489662c 100644 (file)
--- a/legacy/org.argeo.slc.client.ui/pom.xml
+++ b/legacy/org.argeo.slc.client.ui/pom.xml
@@ -29,7 +29,7 @@
                        <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons</groupId>
+                       <groupId>org.argeo.commons.rap</groupId>
                        <artifactId>org.argeo.swt.specific.rap</artifactId>
                        <version>${version.argeo-commons}</version>
                        <scope>provided</scope>

diff --git a/legacy/org.argeo.slc.launcher/pom.xml b/legacy/org.argeo.slc.launcher/pom.xml
index c073f604c7dd9d61995bb8e8bb1e1dc7fd781b33..1ff6e9ac5361ffc15a25e225f5e98c0d8614f288 100644 (file)
--- a/legacy/org.argeo.slc.launcher/pom.xml
+++ b/legacy/org.argeo.slc.launcher/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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">
+<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>
@@ -12,59 +14,59 @@
        <name>SLC Launcher</name>
        <build>
                <plugins>
-<!--                   <plugin> -->
-<!--                           <groupId>org.apache.maven.plugins</groupId> -->
-<!--                           <artifactId>maven-assembly-plugin</artifactId> -->
-<!--                           <configuration> -->
-<!--                                   <descriptors> -->
-<!--                                           <descriptor>assembly/base.xml</descriptor> -->
-<!--                                   </descriptors> -->
-<!--                           </configuration> -->
-<!--                           <executions> -->
-<!--                                   <execution> -->
-<!--                                           <id>assembly-base</id> -->
-<!--                                           <phase>package</phase> -->
-<!--                                           <goals> -->
-<!--                                                   <goal>single</goal> -->
-<!--                                           </goals> -->
-<!--                                   </execution> -->
-<!--                           </executions> -->
-<!--                   </plugin> -->
-<!--                   <plugin> -->
-<!--                           <groupId>org.apache.felix</groupId> -->
-<!--                           <artifactId>maven-bundle-plugin</artifactId> -->
-<!--                           <configuration> -->
-<!--                                   <instructions> -->
-<!--                                           <Main-Class>org.argeo.slc.cli.SlcMain</Main-Class> -->
-<!--                                   </instructions> -->
-<!--                           </configuration> -->
-<!--                   </plugin> -->
-<!--                   <plugin> -->
-<!--                           <artifactId>maven-resources-plugin</artifactId> -->
-<!--                           <executions> -->
-<!--                                   <execution> -->
-<!--                                           <phase>validate</phase> -->
-<!--                                           <goals> -->
-<!--                                                   <goal>copy-resources</goal> -->
-<!--                                           </goals> -->
-<!--                                           <configuration> -->
-<!--                                                   <outputDirectory>${basedir}/target/base</outputDirectory> -->
-<!--                                                   <resources> -->
-<!--                                                           <resource> -->
-<!--                                                                   <directory>base</directory> -->
-<!--                                                                   <filtering>true</filtering> -->
-<!--                                                           </resource> -->
-<!--                                                   </resources> -->
-<!--                                           </configuration> -->
-<!--                                   </execution> -->
-<!--                           </executions> -->
-<!--                   </plugin> -->
+                       <!-- <plugin> -->
+                       <!-- <groupId>org.apache.maven.plugins</groupId> -->
+                       <!-- <artifactId>maven-assembly-plugin</artifactId> -->
+                       <!-- <configuration> -->
+                       <!-- <descriptors> -->
+                       <!-- <descriptor>assembly/base.xml</descriptor> -->
+                       <!-- </descriptors> -->
+                       <!-- </configuration> -->
+                       <!-- <executions> -->
+                       <!-- <execution> -->
+                       <!-- <id>assembly-base</id> -->
+                       <!-- <phase>package</phase> -->
+                       <!-- <goals> -->
+                       <!-- <goal>single</goal> -->
+                       <!-- </goals> -->
+                       <!-- </execution> -->
+                       <!-- </executions> -->
+                       <!-- </plugin> -->
+                       <!-- <plugin> -->
+                       <!-- <groupId>org.apache.felix</groupId> -->
+                       <!-- <artifactId>maven-bundle-plugin</artifactId> -->
+                       <!-- <configuration> -->
+                       <!-- <instructions> -->
+                       <!-- <Main-Class>org.argeo.slc.cli.SlcMain</Main-Class> -->
+                       <!-- </instructions> -->
+                       <!-- </configuration> -->
+                       <!-- </plugin> -->
+                       <!-- <plugin> -->
+                       <!-- <artifactId>maven-resources-plugin</artifactId> -->
+                       <!-- <executions> -->
+                       <!-- <execution> -->
+                       <!-- <phase>validate</phase> -->
+                       <!-- <goals> -->
+                       <!-- <goal>copy-resources</goal> -->
+                       <!-- </goals> -->
+                       <!-- <configuration> -->
+                       <!-- <outputDirectory>${basedir}/target/base</outputDirectory> -->
+                       <!-- <resources> -->
+                       <!-- <resource> -->
+                       <!-- <directory>base</directory> -->
+                       <!-- <filtering>true</filtering> -->
+                       <!-- </resource> -->
+                       <!-- </resources> -->
+                       <!-- </configuration> -->
+                       <!-- </execution> -->
+                       <!-- </executions> -->
+                       <!-- </plugin> -->
                </plugins>
        </build>
        <dependencies>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <artifactId>org.argeo.init</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
        </dependencies>

diff --git a/legacy/org.argeo.slc.launcher/src/org/argeo/slc/cli/SlcMain.java b/legacy/org.argeo.slc.launcher/src/org/argeo/slc/cli/SlcMain.java
index 8717b503055cc8549ea2911d9efdf5c00762bb3f..0da1121d1d60dac67e64135125cc8685961d98e8 100644 (file)
--- a/legacy/org.argeo.slc.launcher/src/org/argeo/slc/cli/SlcMain.java
+++ b/legacy/org.argeo.slc.launcher/src/org/argeo/slc/cli/SlcMain.java
@@ -18,7 +18,7 @@ import java.util.UUID;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 
-import org.argeo.osgi.boot.OsgiBoot;
+import org.argeo.init.osgi.OsgiBoot;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.launch.Framework;

diff --git a/legacy/org.argeo.slc.spring/pom.xml b/legacy/org.argeo.slc.spring/pom.xml
index 9cd31ff0a3d3e716158d2c60f2691519f3185960..bf268179bfb6392e41a10048e34199c6b844df5f 100644 (file)
--- a/legacy/org.argeo.slc.spring/pom.xml
+++ b/legacy/org.argeo.slc.spring/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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>
@@ -12,7 +14,7 @@
                <!-- Commons -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.enterprise</artifactId>
+                       <artifactId>org.argeo.util</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>
@@ -34,7 +36,7 @@
                <!-- Commons -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <artifactId>org.argeo.init</artifactId>
                        <version>${version.argeo-commons}</version>
                        <scope>provided</scope>
                </dependency>

diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractOsgiRuntimeTestCase.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractOsgiRuntimeTestCase.java
index 734a5ec9493fea95bef08ed03f3e1fb38423f0f8..65dfa55c997e13acbe8219b91ec39c501fb43a87 100644 (file)
--- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractOsgiRuntimeTestCase.java
+++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractOsgiRuntimeTestCase.java
@@ -7,7 +7,7 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.osgi.boot.OsgiBoot;
+import org.argeo.init.osgi.OsgiBoot;
 import org.argeo.slc.SlcException;
 import org.eclipse.core.runtime.adaptor.EclipseStarter;
 import org.eclipse.gemini.blueprint.util.OsgiStringUtils;

diff --git a/org.argeo.slc.jcr/pom.xml b/org.argeo.slc.jcr/pom.xml
index c3638c2d8c97ae03a1c89e5e4b8436d734b0aa48..9aac77be5e72ee5057ba0ac59ec5c074c93ac50e 100644 (file)
--- a/org.argeo.slc.jcr/pom.xml
+++ b/org.argeo.slc.jcr/pom.xml
@@ -24,7 +24,7 @@
                <!-- Commons -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.enterprise</artifactId>
+                       <artifactId>org.argeo.util</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>