WIP #106

.gitignore

@@ -1,5 +1,9 @@
 target/
+overlays/
+
 .settings/
 .classpath
 .project
 
+*.iml
+.idea/

oslc-client-base/pom.xml

@@ -0,0 +1,12 @@
+<?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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.example</groupId>
+  <artifactId>oslc-client-base</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+
+</project>

oslc-java-client/src/main/java/org/eclipse/lyo/client/exception/FixMessageFormat.java → oslc-client-base/src/main/java/org/eclipse/lyo/client/exception/exception/FixMessageFormat.java

@@ -16,7 +16,7 @@
  *     Chris Peters         - initial API and implementation
  *     Gianluca Bernardini  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.lyo.client.exception;
+package org.eclipse.lyo.client.exception.exception;
 
 public class FixMessageFormat {
 

oslc-java-client/src/main/java/org/eclipse/lyo/client/exception/JazzAuthErrorException.java → oslc-client-base/src/main/java/org/eclipse/lyo/client/exception/exception/JazzAuthErrorException.java

@@ -13,7 +13,7 @@
  *
  *     Michael Fiedler     - initial API and implementation
  *******************************************************************************/
-package org.eclipse.lyo.client.exception;
+package org.eclipse.lyo.client.exception.exception;
 
 
 /**

oslc-java-client/src/main/java/org/eclipse/lyo/client/exception/JazzAuthFailedException.java → oslc-client-base/src/main/java/org/eclipse/lyo/client/exception/exception/JazzAuthFailedException.java

@@ -13,7 +13,7 @@
  *
  *     Michael Fiedler     - initial API and implementation
  *******************************************************************************/
-package org.eclipse.lyo.client.exception;
+package org.eclipse.lyo.client.exception.exception;
 
 
 /**

oslc-java-client/src/main/java/org/eclipse/lyo/client/exception/MessageExtractor.java → oslc-client-base/src/main/java/org/eclipse/lyo/client/exception/exception/MessageExtractor.java

@@ -16,7 +16,7 @@
  *     Chris Peters         - initial API and implementation
  *     Gianluca Bernardini  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.lyo.client.exception;
+package org.eclipse.lyo.client.exception.exception;
 
 import java.text.MessageFormat;
 import java.util.Locale;

oslc-java-client/src/main/java/org/eclipse/lyo/client/exception/OslcClientApplicationException.java → oslc-client-base/src/main/java/org/eclipse/lyo/client/exception/exception/OslcClientApplicationException.java

@@ -16,7 +16,7 @@
  *     Chris Peters         - initial API and implementation
  *     Gianluca Bernardini  - initial API and implementation
  *******************************************************************************/
-package org.eclipse.lyo.client.exception;
+package org.eclipse.lyo.client.exception.exception;
 
 /**
  * Base class for all application exceptions.

oslc-java-client/src/main/java/org/eclipse/lyo/client/exception/ResourceNotFoundException.java → oslc-client-base/src/main/java/org/eclipse/lyo/client/exception/exception/ResourceNotFoundException.java

@@ -13,7 +13,7 @@
  *
  *     Michael Fiedler     - initial API and implementation
  *******************************************************************************/
-package org.eclipse.lyo.client.exception;
+package org.eclipse.lyo.client.exception.exception;
 
 
 /**

oslc-java-client/src/main/java/org/eclipse/lyo/client/exception/RootServicesException.java → oslc-client-base/src/main/java/org/eclipse/lyo/client/exception/exception/RootServicesException.java

@@ -13,7 +13,7 @@
  *
  *     Michael Fiedler     - initial API and implementation
  *******************************************************************************/
-package org.eclipse.lyo.client.exception;
+package org.eclipse.lyo.client.exception.exception;
 
 
 @SuppressWarnings("serial")

oslc4j-client/pom.xml → oslc-client/pom.xml

@@ -2,7 +2,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.eclipse.lyo.clients</groupId>
-    <artifactId>oslc4j-client</artifactId>
+    <artifactId>oslc-client</artifactId>
     <version>4.0.0-SNAPSHOT</version>
     <name>OSLC Java Client (JAX-RS 2.0)</name>
     <description>Eclipse Lyo OSLC Java client based on OSLC4J and JAX-RS 2.0</description>

oslc-java-client-resources/pom.xml

@@ -0,0 +1,12 @@
+<?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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.example</groupId>
+  <artifactId>oslc-java-client-resources</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+
+</project>

oslc-java-client/src/main/java/org/eclipse/lyo/client/oslc/OslcClient.java

@@ -58,7 +58,7 @@
 import org.apache.wink.client.Resource;
 import org.apache.wink.client.RestClient;
 import org.apache.wink.client.httpclient.ApacheHttpClientConfig;
-import org.eclipse.lyo.client.exception.ResourceNotFoundException;
+import org.eclipse.lyo.client.exception.exception.ResourceNotFoundException;
 import org.eclipse.lyo.client.oslc.resources.OslcQuery;
 import org.eclipse.lyo.oslc4j.core.model.CreationFactory;
 import org.eclipse.lyo.oslc4j.core.model.QueryCapability;

oslc-java-client/src/main/java/org/eclipse/lyo/client/oslc/jazz/JazzFormAuthClient.java

@@ -28,8 +28,8 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.util.EntityUtils;
 import org.apache.xerces.impl.dv.util.Base64;
-import org.eclipse.lyo.client.exception.JazzAuthErrorException;
-import org.eclipse.lyo.client.exception.JazzAuthFailedException;
+import org.eclipse.lyo.client.exception.exception.JazzAuthErrorException;
+import org.eclipse.lyo.client.exception.exception.JazzAuthFailedException;
 import org.eclipse.lyo.client.oslc.OslcClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

oslc-java-client/src/main/java/org/eclipse/lyo/client/oslc/jazz/JazzRootServicesHelper.java

@@ -23,8 +23,8 @@
 import javax.ws.rs.core.UriBuilder;
 
 import org.apache.wink.client.ClientResponse;
-import org.eclipse.lyo.client.exception.ResourceNotFoundException;
-import org.eclipse.lyo.client.exception.RootServicesException;
+import org.eclipse.lyo.client.exception.exception.ResourceNotFoundException;
+import org.eclipse.lyo.client.exception.exception.RootServicesException;
 import org.eclipse.lyo.client.oslc.OSLCConstants;
 import org.eclipse.lyo.client.oslc.OslcClient;
 import org.eclipse.lyo.client.oslc.OslcOAuthClient;

oslc-java-client/src/main/java/org/eclipse/lyo/client/oslc/resources/RmUtil.java

@@ -26,7 +26,7 @@
 import net.oauth.OAuthException;
 
 import org.apache.wink.client.ClientResponse;
-import org.eclipse.lyo.client.exception.ResourceNotFoundException;
+import org.eclipse.lyo.client.exception.exception.ResourceNotFoundException;
 import org.eclipse.lyo.client.oslc.OSLCConstants;
 import org.eclipse.lyo.client.oslc.OslcClient;
 import org.eclipse.lyo.oslc4j.core.model.CreationFactory;