osgi friendly REST packaging

modules/activiti-common-rest/src/main/java/org/activiti/rest/api/AbstractPaginateList.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/api/AbstractPaginateList.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.api;
+package org.activiti.rest.common.api;
 
 import java.util.List;
 import java.util.Map;

modules/activiti-common-rest/src/main/java/org/activiti/rest/api/ActivitiUtil.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/api/ActivitiUtil.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.api;
+package org.activiti.rest.common.api;
 
 import org.activiti.engine.FormService;
 import org.activiti.engine.HistoryService;

modules/activiti-common-rest/src/main/java/org/activiti/rest/api/ActivitiUtilProvider.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/api/ActivitiUtilProvider.java

@@ -1,4 +1,4 @@
-package org.activiti.rest.api;
+package org.activiti.rest.common.api;
 
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.ProcessEngineInfo;

modules/activiti-common-rest/src/main/java/org/activiti/rest/api/DataResponse.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/api/DataResponse.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.api;
+package org.activiti.rest.common.api;
 
 /**
  * @author Tijs Rademakers

modules/activiti-common-rest/src/main/java/org/activiti/rest/api/DefaultPaginateList.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/api/DefaultPaginateList.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.api;
+package org.activiti.rest.common.api;
 
 import java.util.List;
 

modules/activiti-common-rest/src/main/java/org/activiti/rest/api/DefaultResource.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/api/DefaultResource.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.api;
+package org.activiti.rest.common.api;
 
 import java.io.InputStream;
 

modules/activiti-common-rest/src/main/java/org/activiti/rest/api/RequestUtil.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/api/RequestUtil.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.api;
+package org.activiti.rest.common.api;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

modules/activiti-common-rest/src/main/java/org/activiti/rest/api/RestError.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/api/RestError.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.api;
+package org.activiti.rest.common.api;
 
 
 /**

modules/activiti-common-rest/src/main/java/org/activiti/rest/api/SecuredResource.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/api/SecuredResource.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.api;
+package org.activiti.rest.common.api;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -25,7 +25,7 @@
 
 import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.identity.Group;
-import org.activiti.rest.application.ActivitiRestApplication;
+import org.activiti.rest.common.application.ActivitiRestApplication;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.util.ISO8601DateFormat;
 import org.restlet.data.Form;

modules/activiti-common-rest/src/main/java/org/activiti/rest/application/ActivitiRestApplication.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/application/ActivitiRestApplication.java

@@ -11,10 +11,10 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.application;
+package org.activiti.rest.common.application;
 
-import org.activiti.rest.api.ActivitiUtil;
-import org.activiti.rest.filter.RestAuthenticator;
+import org.activiti.rest.common.api.ActivitiUtil;
+import org.activiti.rest.common.filter.RestAuthenticator;
 import org.restlet.Application;
 import org.restlet.Request;
 import org.restlet.Response;

modules/activiti-common-rest/src/main/java/org/activiti/rest/application/ActivitiStatusService.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/application/ActivitiStatusService.java

@@ -11,14 +11,14 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.application;
+package org.activiti.rest.common.application;
 
 import org.activiti.engine.ActivitiException;
 import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.ActivitiObjectNotFoundException;
 import org.activiti.engine.ActivitiOptimisticLockingException;
 import org.activiti.engine.ActivitiTaskAlreadyClaimedException;
-import org.activiti.rest.api.RestError;
+import org.activiti.rest.common.api.RestError;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.restlet.Request;
 import org.restlet.Response;

modules/activiti-common-rest/src/main/java/org/activiti/rest/application/DefaultMediaTypeResolver.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/application/DefaultMediaTypeResolver.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.application;
+package org.activiti.rest.common.application;
 
 import org.restlet.data.MediaType;
 

modules/activiti-common-rest/src/main/java/org/activiti/rest/application/MediaTypeResolver.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/application/MediaTypeResolver.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.application;
+package org.activiti.rest.common.application;
 
 import org.restlet.data.MediaType;
 

modules/activiti-common-rest/src/main/java/org/activiti/rest/filter/JsonpFilter.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/filter/JsonpFilter.java

@@ -1,4 +1,4 @@
-package org.activiti.rest.filter;
+package org.activiti.rest.common.filter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

modules/activiti-common-rest/src/main/java/org/activiti/rest/filter/RestAuthenticator.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/filter/RestAuthenticator.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.filter;
+package org.activiti.rest.common.filter;
 
 import org.restlet.Request;
 

modules/activiti-common-rest/src/main/java/org/activiti/rest/servlet/ActivitiServletContextListener.java → modules/activiti-common-rest/src/main/java/org/activiti/rest/common/servlet/ActivitiServletContextListener.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.servlet;
+package org.activiti.rest.common.servlet;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;

modules/activiti-diagram-rest/src/main/java/org/activiti/diagram/rest/application/DiagramRestApplication.java → modules/activiti-diagram-rest/src/main/java/org/activiti/rest/diagram/application/DiagramRestApplication.java

@@ -10,10 +10,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activiti.diagram.rest.application;
+package org.activiti.rest.diagram.application;
 
-import org.activiti.rest.application.ActivitiRestApplication;
-import org.activiti.rest.filter.JsonpFilter;
+import org.activiti.rest.common.application.ActivitiRestApplication;
+import org.activiti.rest.common.filter.JsonpFilter;
 import org.restlet.Restlet;
 import org.restlet.routing.Router;
 

modules/activiti-diagram-rest/src/main/java/org/activiti/diagram/rest/application/DiagramServicesInit.java → modules/activiti-diagram-rest/src/main/java/org/activiti/rest/diagram/application/DiagramServicesInit.java

@@ -1,7 +1,7 @@
-package org.activiti.diagram.rest.application;
+package org.activiti.rest.diagram.application;
 
-import org.activiti.diagram.rest.services.ProcessDefinitionDiagramLayoutResource;
-import org.activiti.diagram.rest.services.ProcessInstanceHighlightsResource;
+import org.activiti.rest.diagram.services.ProcessDefinitionDiagramLayoutResource;
+import org.activiti.rest.diagram.services.ProcessInstanceHighlightsResource;
 import org.restlet.routing.Router;
 
 public class DiagramServicesInit {

modules/activiti-diagram-rest/src/main/java/org/activiti/diagram/rest/services/ProcessDefinitionDiagramLayoutResource.java → modules/activiti-diagram-rest/src/main/java/org/activiti/rest/diagram/services/ProcessDefinitionDiagramLayoutResource.java

@@ -1,4 +1,4 @@
-package org.activiti.diagram.rest.services;
+package org.activiti.rest.diagram.services;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,8 +29,8 @@
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.Execution;
 import org.activiti.engine.runtime.ProcessInstance;
-import org.activiti.rest.api.ActivitiUtil;
-import org.activiti.rest.api.SecuredResource;
+import org.activiti.rest.common.api.ActivitiUtil;
+import org.activiti.rest.common.api.SecuredResource;
 import org.apache.commons.lang3.StringUtils;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;

modules/activiti-diagram-rest/src/main/java/org/activiti/diagram/rest/services/ProcessInstanceHighlightsResource.java → modules/activiti-diagram-rest/src/main/java/org/activiti/rest/diagram/services/ProcessInstanceHighlightsResource.java

@@ -1,4 +1,4 @@
-package org.activiti.diagram.rest.services;
+package org.activiti.rest.diagram.services;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -15,8 +15,8 @@
 import org.activiti.engine.impl.pvm.PvmTransition;
 import org.activiti.engine.impl.pvm.process.ActivityImpl;
 import org.activiti.engine.runtime.ProcessInstance;
-import org.activiti.rest.api.ActivitiUtil;
-import org.activiti.rest.api.SecuredResource;
+import org.activiti.rest.common.api.ActivitiUtil;
+import org.activiti.rest.common.api.SecuredResource;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.node.ArrayNode;
 import org.codehaus.jackson.node.ObjectNode;

modules/activiti-engine/src/test/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+

modules/activiti-modeler/src/main/java/org/activiti/editor/rest/application/ModelerRestApplication.java → modules/activiti-modeler/src/main/java/org/activiti/rest/editor/application/ModelerRestApplication.java

@@ -10,9 +10,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activiti.editor.rest.application;
+package org.activiti.rest.editor.application;
 
-import org.activiti.rest.application.ActivitiRestApplication;
+import org.activiti.rest.common.application.ActivitiRestApplication;
 import org.restlet.Restlet;
 import org.restlet.routing.Router;
 

modules/activiti-modeler/src/main/java/org/activiti/editor/rest/application/ModelerServicesInit.java → modules/activiti-modeler/src/main/java/org/activiti/rest/editor/application/ModelerServicesInit.java

@@ -1,10 +1,10 @@
-package org.activiti.editor.rest.application;
+package org.activiti.rest.editor.application;
 
-import org.activiti.editor.rest.main.EditorRestResource;
-import org.activiti.editor.rest.main.PluginRestResource;
-import org.activiti.editor.rest.main.StencilsetRestResource;
-import org.activiti.editor.rest.model.ModelEditorJsonRestResource;
-import org.activiti.editor.rest.model.ModelSaveRestResource;
+import org.activiti.rest.editor.main.EditorRestResource;
+import org.activiti.rest.editor.main.PluginRestResource;
+import org.activiti.rest.editor.main.StencilsetRestResource;
+import org.activiti.rest.editor.model.ModelEditorJsonRestResource;
+import org.activiti.rest.editor.model.ModelSaveRestResource;
 import org.restlet.routing.Router;
 
 public class ModelerServicesInit {

modules/activiti-modeler/src/main/java/org/activiti/editor/rest/main/EditorRestResource.java → modules/activiti-modeler/src/main/java/org/activiti/rest/editor/main/EditorRestResource.java

@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activiti.editor.rest.main;
+package org.activiti.rest.editor.main;
 
 import java.io.InputStream;
 

modules/activiti-modeler/src/main/java/org/activiti/editor/rest/main/PluginRestResource.java → modules/activiti-modeler/src/main/java/org/activiti/rest/editor/main/PluginRestResource.java

@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activiti.editor.rest.main;
+package org.activiti.rest.editor.main;
 
 import java.io.InputStream;
 

modules/activiti-modeler/src/main/java/org/activiti/editor/rest/main/StencilsetRestResource.java → modules/activiti-modeler/src/main/java/org/activiti/rest/editor/main/StencilsetRestResource.java

@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activiti.editor.rest.main;
+package org.activiti.rest.editor.main;
 
 import java.io.InputStream;
 

modules/activiti-modeler/src/main/java/org/activiti/editor/rest/model/ModelEditorJsonRestResource.java → modules/activiti-modeler/src/main/java/org/activiti/rest/editor/model/ModelEditorJsonRestResource.java

@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activiti.editor.rest.model;
+package org.activiti.rest.editor.model;
 
 import org.activiti.editor.constants.ModelDataJsonConstants;
 import org.activiti.engine.ProcessEngines;

modules/activiti-modeler/src/main/java/org/activiti/editor/rest/model/ModelSaveRestResource.java → modules/activiti-modeler/src/main/java/org/activiti/rest/editor/model/ModelSaveRestResource.java

@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activiti.editor.rest.model;
+package org.activiti.rest.editor.model;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

modules/activiti-rest/src/main/java/org/activiti/rest/api/RestActionRequest.java → modules/activiti-rest/src/main/java/org/activiti/rest/service/api/RestActionRequest.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.api;
+package org.activiti.rest.service.api;
 
 /**
  * Generic class that represents an action to be performed on a resource. Should be subclasses

modules/activiti-rest/src/main/java/org/activiti/rest/api/RestResponseFactory.java → modules/activiti-rest/src/main/java/org/activiti/rest/service/api/RestResponseFactory.java

@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package org.activiti.rest.api;
+package org.activiti.rest.service.api;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,44 +46,46 @@
 import org.activiti.engine.task.Event;
 import org.activiti.engine.task.IdentityLink;
 import org.activiti.engine.task.Task;
-import org.activiti.rest.api.engine.AttachmentResponse;
-import org.activiti.rest.api.engine.CommentResponse;
-import org.activiti.rest.api.engine.EventResponse;
-import org.activiti.rest.api.engine.RestIdentityLink;
-import org.activiti.rest.api.engine.variable.BooleanRestVariableConverter;
-import org.activiti.rest.api.engine.variable.DateRestVariableConverter;
-import org.activiti.rest.api.engine.variable.DoubleRestVariableConverter;
-import org.activiti.rest.api.engine.variable.IntegerRestVariableConverter;
-import org.activiti.rest.api.engine.variable.LongRestVariableConverter;
-import org.activiti.rest.api.engine.variable.QueryVariable;
-import org.activiti.rest.api.engine.variable.RestVariable;
-import org.activiti.rest.api.engine.variable.RestVariable.RestVariableScope;
-import org.activiti.rest.api.engine.variable.RestVariableConverter;
-import org.activiti.rest.api.engine.variable.ShortRestVariableConverter;
-import org.activiti.rest.api.engine.variable.StringRestVariableConverter;
-import org.activiti.rest.api.form.FormDataResponse;
-import org.activiti.rest.api.form.RestEnumFormProperty;
-import org.activiti.rest.api.form.RestFormProperty;
-import org.activiti.rest.api.history.HistoricActivityInstanceResponse;
-import org.activiti.rest.api.history.HistoricDetailResponse;
-import org.activiti.rest.api.history.HistoricIdentityLinkResponse;
-import org.activiti.rest.api.history.HistoricProcessInstanceResponse;
-import org.activiti.rest.api.history.HistoricTaskInstanceResponse;
-import org.activiti.rest.api.history.HistoricVariableInstanceResponse;
-import org.activiti.rest.api.identity.GroupResponse;
-import org.activiti.rest.api.identity.MembershipResponse;
-import org.activiti.rest.api.identity.UserInfoResponse;
-import org.activiti.rest.api.identity.UserResponse;
-import org.activiti.rest.api.management.JobResponse;
-import org.activiti.rest.api.management.TableResponse;
-import org.activiti.rest.api.repository.DeploymentResourceResponse;
-import org.activiti.rest.api.repository.DeploymentResourceResponse.DeploymentResourceType;
-import org.activiti.rest.api.repository.DeploymentResponse;
-import org.activiti.rest.api.repository.ModelResponse;
-import org.activiti.rest.api.repository.ProcessDefinitionResponse;
-import org.activiti.rest.api.runtime.process.ExecutionResponse;
-import org.activiti.rest.api.runtime.process.ProcessInstanceResponse;
-import org.activiti.rest.api.runtime.task.TaskResponse;
+import org.activiti.rest.common.api.ActivitiUtil;
+import org.activiti.rest.common.api.SecuredResource;
+import org.activiti.rest.service.api.engine.AttachmentResponse;
+import org.activiti.rest.service.api.engine.CommentResponse;
+import org.activiti.rest.service.api.engine.EventResponse;
+import org.activiti.rest.service.api.engine.RestIdentityLink;
+import org.activiti.rest.service.api.engine.variable.BooleanRestVariableConverter;
+import org.activiti.rest.service.api.engine.variable.DateRestVariableConverter;
+import org.activiti.rest.service.api.engine.variable.DoubleRestVariableConverter;
+import org.activiti.rest.service.api.engine.variable.IntegerRestVariableConverter;
+import org.activiti.rest.service.api.engine.variable.LongRestVariableConverter;
+import org.activiti.rest.service.api.engine.variable.QueryVariable;
+import org.activiti.rest.service.api.engine.variable.RestVariable;
+import org.activiti.rest.service.api.engine.variable.RestVariableConverter;
+import org.activiti.rest.service.api.engine.variable.ShortRestVariableConverter;
+import org.activiti.rest.service.api.engine.variable.StringRestVariableConverter;
+import org.activiti.rest.service.api.engine.variable.RestVariable.RestVariableScope;
+import org.activiti.rest.service.api.form.FormDataResponse;
+import org.activiti.rest.service.api.form.RestEnumFormProperty;
+import org.activiti.rest.service.api.form.RestFormProperty;
+import org.activiti.rest.service.api.history.HistoricActivityInstanceResponse;
+import org.activiti.rest.service.api.history.HistoricDetailResponse;
+import org.activiti.rest.service.api.history.HistoricIdentityLinkResponse;
+import org.activiti.rest.service.api.history.HistoricProcessInstanceResponse;
+import org.activiti.rest.service.api.history.HistoricTaskInstanceResponse;
+import org.activiti.rest.service.api.history.HistoricVariableInstanceResponse;
+import org.activiti.rest.service.api.identity.GroupResponse;
+import org.activiti.rest.service.api.identity.MembershipResponse;
+import org.activiti.rest.service.api.identity.UserInfoResponse;
+import org.activiti.rest.service.api.identity.UserResponse;
+import org.activiti.rest.service.api.management.JobResponse;
+import org.activiti.rest.service.api.management.TableResponse;
+import org.activiti.rest.service.api.repository.DeploymentResourceResponse;
+import org.activiti.rest.service.api.repository.DeploymentResponse;
+import org.activiti.rest.service.api.repository.ModelResponse;
+import org.activiti.rest.service.api.repository.ProcessDefinitionResponse;
+import org.activiti.rest.service.api.repository.DeploymentResourceResponse.DeploymentResourceType;
+import org.activiti.rest.service.api.runtime.process.ExecutionResponse;
+import org.activiti.rest.service.api.runtime.process.ProcessInstanceResponse;
+import org.activiti.rest.service.api.runtime.task.TaskResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.restlet.data.MediaType;