diff --git a/migration/i1.0a-release/oracle/201212131727_WS005_IdempiereWebservice.sql b/migration/i1.0a-release/oracle/201212131727_WS005_IdempiereWebservice.sql index d5934ac91e..0e2a36cf46 100644 --- a/migration/i1.0a-release/oracle/201212131727_WS005_IdempiereWebservice.sql +++ b/migration/i1.0a-release/oracle/201212131727_WS005_IdempiereWebservice.sql @@ -251,6 +251,16 @@ INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Clien ALTER TABLE WS_WebServiceTypeAccess ADD WS_WebServiceTypeAccess_UU NVARCHAR2(36) DEFAULT NULL ; +-- Dec 17, 2012 12:03:20 PM IST +-- IDEMPIERE-460 Adding support for composite service +INSERT INTO AD_Column (IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsUpdateable,ColumnName,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,IsAlwaysUpdateable) VALUES ('N',0,53163,205535,'D','N','N','N','N',36,'N',10,'N',1000001,'4a981564-a0d8-494e-b5a2-ae60bbb54404','Y','WS_WebServiceMethod_UU','WS_WebServiceMethod_UU',100,TO_DATE('2012-12-17 12:03:18','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_DATE('2012-12-17 12:03:18','YYYY-MM-DD HH24:MI:SS'),100,0,'N') +; + +-- Dec 17, 2012 12:03:20 PM IST +-- IDEMPIERE-460 Adding support for composite service +INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=205535 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID) +; + diff --git a/migration/i1.0a-release/postgresql/201212131727_WS005_IdempiereWebservice.sql b/migration/i1.0a-release/postgresql/201212131727_WS005_IdempiereWebservice.sql index 69c8327862..c187aa28d5 100644 --- a/migration/i1.0a-release/postgresql/201212131727_WS005_IdempiereWebservice.sql +++ b/migration/i1.0a-release/postgresql/201212131727_WS005_IdempiereWebservice.sql @@ -251,6 +251,15 @@ INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Clien ALTER TABLE WS_WebServiceTypeAccess ADD COLUMN WS_WebServiceTypeAccess_UU VARCHAR(36) DEFAULT NULL ; +-- Dec 17, 2012 12:03:20 PM IST +-- IDEMPIERE-460 Adding support for composite service +INSERT INTO AD_Column (IsEncrypted,Version,AD_Table_ID,AD_Column_ID,EntityType,IsMandatory,IsTranslated,IsIdentifier,IsParent,FieldLength,IsSelectionColumn,AD_Reference_ID,IsKey,AD_Element_ID,AD_Column_UU,IsUpdateable,ColumnName,Name,CreatedBy,Updated,AD_Org_ID,IsActive,Created,UpdatedBy,AD_Client_ID,IsAlwaysUpdateable) VALUES ('N',0,53163,205535,'D','N','N','N','N',36,'N',10,'N',1000001,'4a981564-a0d8-494e-b5a2-ae60bbb54404','Y','WS_WebServiceMethod_UU','WS_WebServiceMethod_UU',100,TO_TIMESTAMP('2012-12-17 12:03:18','YYYY-MM-DD HH24:MI:SS'),0,'Y',TO_TIMESTAMP('2012-12-17 12:03:18','YYYY-MM-DD HH24:MI:SS'),100,0,'N') +; + +-- Dec 17, 2012 12:03:20 PM IST +-- IDEMPIERE-460 Adding support for composite service +INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy,AD_Column_Trl_UU ) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy,Generate_UUID() FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=205535 AND NOT EXISTS (SELECT * FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID) +; diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath index 2aea2704d7..6f33b3cfd4 100644 --- a/org.idempiere.webservices/.classpath +++ b/org.idempiere.webservices/.classpath @@ -1,6 +1,6 @@ - + @@ -20,7 +20,6 @@ - diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index 77666081bf..18e31ba641 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -31,11 +31,11 @@ Bundle-ClassPath: ., WEB-INF/lib/xmlbeans-2.5.0.jar, WEB-INF/lib/aopalliance-1.0.jar, WEB-INF/lib/commons-logging-1.1.1.jar, - WEB-INF/lib/Idempiere-XMLSBean-1.0.jar -Export-Package: com._3e.ADInterface, - org.compiere.model, + WEB-INF/lib/idempiere-xmlbeans-1.0.jar +Export-Package: org.compiere.model, org.idempiere.adInterface.x10, org.idempiere.adInterface.x10.impl, + org.idempiere.adinterface, org.idempiere.webservices, org.idempiere.webservices.fault Web-ContextPath: ADInterface diff --git a/org.idempiere.webservices/META-INF/cxf/services.xml b/org.idempiere.webservices/META-INF/cxf/services.xml index 745bf5475e..da7b9f577d 100644 --- a/org.idempiere.webservices/META-INF/cxf/services.xml +++ b/org.idempiere.webservices/META-INF/cxf/services.xml @@ -6,7 +6,7 @@ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"--> - + @@ -20,4 +20,4 @@ - + diff --git a/org.idempiere.webservices/WEB-INF/src/com/bizidium/ws/CompositeService.java b/org.idempiere.webservices/WEB-INF/src/com/bizidium/ws/CompositeService.java index 29ade1552c..667dcfae57 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/bizidium/ws/CompositeService.java +++ b/org.idempiere.webservices/WEB-INF/src/com/bizidium/ws/CompositeService.java @@ -6,12 +6,12 @@ import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.jws.soap.SOAPBinding.Style; import javax.jws.soap.SOAPBinding.Use; -import org.idempiere.adInterface.x10.CompositeModelRequestDocument; +import org.idempiere.adInterface.x10.CompositeRequestDocument; import org.idempiere.adInterface.x10.CompositeResponsesDocument; @WebService(targetNamespace="http://idempiere.org/ADInterface/1_0") @SOAPBinding(style=Style.RPC,use=Use.LITERAL,parameterStyle=ParameterStyle.WRAPPED) public interface CompositeService { - public CompositeResponsesDocument compositeCRUD(CompositeModelRequestDocument reqs); + public CompositeResponsesDocument compositeOperation(CompositeRequestDocument reqs); } diff --git a/org.idempiere.webservices/WEB-INF/src/com/bizidium/ws/CompositeServiceImpl.java b/org.idempiere.webservices/WEB-INF/src/com/bizidium/ws/CompositeServiceImpl.java index 55ee817f48..5553086823 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/bizidium/ws/CompositeServiceImpl.java +++ b/org.idempiere.webservices/WEB-INF/src/com/bizidium/ws/CompositeServiceImpl.java @@ -21,8 +21,8 @@ import javax.jws.WebService; import org.compiere.util.CLogger; import org.compiere.util.Trx; import org.idempiere.adInterface.x10.ADLoginRequest; -import org.idempiere.adInterface.x10.CompositeModelRequest; -import org.idempiere.adInterface.x10.CompositeModelRequestDocument; +import org.idempiere.adInterface.x10.CompositeRequest; +import org.idempiere.adInterface.x10.CompositeRequestDocument; import org.idempiere.adInterface.x10.CompositeResponse; import org.idempiere.adInterface.x10.CompositeResponses; import org.idempiere.adInterface.x10.CompositeResponsesDocument; @@ -41,10 +41,10 @@ import org.idempiere.adInterface.x10.RunProcessResponseDocument; import org.idempiere.adInterface.x10.StandardResponse; import org.idempiere.adInterface.x10.StandardResponseDocument; import org.idempiere.adInterface.x10.WindowTabDataDocument; +import org.idempiere.adinterface.CompiereService; +import org.idempiere.adinterface.ModelADServiceImpl; import org.idempiere.webservices.AbstractService; -import com._3e.ADInterface.CompiereService; -import com._3e.ADInterface.ModelADServiceImpl; /** * Composite service interface for combining request and transaction management @@ -52,11 +52,11 @@ import com._3e.ADInterface.ModelADServiceImpl; * @author Deepak Pansheriya * */ -@WebService(endpointInterface = "com.bizidium.ws.CompositeService", serviceName = "compositeInterface") +@WebService(endpointInterface = "com.bizidium.ws.CompositeService", serviceName = "compositeInterface" ,targetNamespace="http://idempiere.org/ADInterface/1_0") public class CompositeServiceImpl extends AbstractService implements CompositeService { private static CLogger log = CLogger.getCLogger(CompositeServiceImpl.class); - private static String webServiceName = new String("biziInterface"); + private static String webServiceName = new String("CompositeInterface"); public CompositeServiceImpl() { @@ -64,14 +64,14 @@ public class CompositeServiceImpl extends AbstractService implements CompositeSe } - public CompositeResponsesDocument compositeCRUD(CompositeModelRequestDocument reqs) { + public CompositeResponsesDocument compositeOperation(CompositeRequestDocument reqs) { CompiereService m_cs = getCompiereService(); CompositeResponsesDocument ret = CompositeResponsesDocument.Factory.newInstance(); CompositeResponses resps = ret.addNewCompositeResponses(); - CompositeModelRequest req = reqs.getCompositeModelRequest(); + CompositeRequest req = reqs.getCompositeRequest(); String serviceType = req.getServiceType(); ADLoginRequest reqlogin = req.getADLoginRequest(); diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADDataStatusListener.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ADDataStatusListener.java similarity index 95% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADDataStatusListener.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ADDataStatusListener.java index f9520f7b0c..104f7f0549 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADDataStatusListener.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ADDataStatusListener.java @@ -1,4 +1,4 @@ -package com._3e.ADInterface; +package org.idempiere.adinterface; import java.util.Properties; diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADInfo.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ADInfo.java similarity index 87% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADInfo.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ADInfo.java index 37c4ec6944..e5074ee477 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADInfo.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ADInfo.java @@ -1,4 +1,4 @@ -package com._3e.ADInterface; +package org.idempiere.adinterface; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADLookup.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ADLookup.java similarity index 95% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADLookup.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ADLookup.java index b648478349..18bc42bd7b 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ADLookup.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ADLookup.java @@ -1,4 +1,4 @@ -package com._3e.ADInterface; +package org.idempiere.adinterface; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -77,7 +77,7 @@ public class ADLookup { return whereClause; } - private DataSet getResult( com._3e.ADInterface.ADInfo info, DataSet ds, int count, String mode ) { + private DataSet getResult( org.idempiere.adinterface.ADInfo info, DataSet ds, int count, String mode ) { if ("count".equals(mode) && count > 1) { DataRow dr = ds.addNewDataRow(); DataField df = dr.addNewField(); diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/CompiereService.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/CompiereService.java similarity index 96% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/CompiereService.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/CompiereService.java index 7a64257895..dc2b6bc6f1 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/CompiereService.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/CompiereService.java @@ -1,4 +1,4 @@ -package com._3e.ADInterface; +package org.idempiere.adinterface; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/CompiereUtil.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/CompiereUtil.java similarity index 92% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/CompiereUtil.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/CompiereUtil.java index 232b8b42b6..dad7c4dd04 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/CompiereUtil.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/CompiereUtil.java @@ -1,4 +1,4 @@ -package com._3e.ADInterface; +package org.idempiere.adinterface; import java.util.Properties; diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/InfoBPartner.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/InfoBPartner.java similarity index 96% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/InfoBPartner.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/InfoBPartner.java index bf9c5f00bd..6aef6f1360 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/InfoBPartner.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/InfoBPartner.java @@ -1,4 +1,4 @@ -package com._3e.ADInterface; +package org.idempiere.adinterface; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/InfoProduct.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/InfoProduct.java similarity index 96% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/InfoProduct.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/InfoProduct.java index 69ac22ff7b..0d9cac450b 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/InfoProduct.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/InfoProduct.java @@ -1,4 +1,4 @@ -package com._3e.ADInterface; +package org.idempiere.adinterface; import java.math.BigDecimal; import java.sql.PreparedStatement; diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/Info_Column.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/Info_Column.java similarity index 95% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/Info_Column.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/Info_Column.java index b2582c406d..3d79ace50f 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/Info_Column.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/Info_Column.java @@ -11,7 +11,7 @@ * All parts are Copyright (C) 1999-2005 ComPiere, Inc. All Rights Reserved. * Contributor(s): ______________________________________. *****************************************************************************/ -package com._3e.ADInterface; +package org.idempiere.adinterface; /** * Info Column Details diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ModelADService.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ModelADService.java similarity index 95% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ModelADService.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ModelADService.java index 2098759695..c11b4d6e80 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ModelADService.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ModelADService.java @@ -27,7 +27,7 @@ * - GlobalQSS (http://www.globalqss.com) * ***********************************************************************/ -package com._3e.ADInterface; +package org.idempiere.adinterface; import javax.jws.WebService; @@ -44,7 +44,7 @@ import org.idempiere.adInterface.x10.RunProcessResponseDocument; import org.idempiere.adInterface.x10.StandardResponseDocument; import org.idempiere.adInterface.x10.WindowTabDataDocument; -@WebService(targetNamespace="http://3e.pl/ADInterface") +@WebService(targetNamespace="http://idempiere.org/ADInterface/1_0") @SOAPBinding(style=Style.RPC,use=Use.LITERAL,parameterStyle=ParameterStyle.WRAPPED) public interface ModelADService { diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ModelADServiceImpl.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ModelADServiceImpl.java similarity index 95% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ModelADServiceImpl.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ModelADServiceImpl.java index 192d2b7bf4..64b3128d26 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ModelADServiceImpl.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ModelADServiceImpl.java @@ -27,7 +27,7 @@ * - GlobalQSS (http://www.globalqss.com) * ***********************************************************************/ -package com._3e.ADInterface; +package org.idempiere.adinterface; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -110,7 +110,7 @@ import org.idempiere.webservices.fault.IdempiereServiceFault; * @author kolec * */ -@WebService(endpointInterface="com._3e.ADInterface.ModelADService", serviceName="ModelADService",targetNamespace="http://3e.pl/ADInterface") +@WebService(endpointInterface="org.idempiere.adinterface.ModelADService", serviceName="ModelADService",targetNamespace="http://idempiere.org/ADInterface/1_0") public class ModelADServiceImpl extends AbstractService implements ModelADService { private static CLogger log = CLogger.getCLogger(ModelADServiceImpl.class); @@ -241,7 +241,7 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic requestCtx.put("DocAction", docAction); // Fire Event - StandardResponseDocument retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIME_BEFORE_PARSE, po, null, trx, requestCtx, + StandardResponseDocument retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIMING_BEFORE_PARSE, po, null, trx, requestCtx, resp, ret); if (retResp != null) return retResp; @@ -256,7 +256,7 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic } // Fire Event - retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIME_BEFORE_SAVE, po, null, trx, requestCtx, resp, ret); + retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIMING_BEFORE_SAVE, po, null, trx, requestCtx, resp, ret); if (retResp != null) return retResp; @@ -266,7 +266,7 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic "Cannot save after set docAction: " + CLogger.retrieveErrorString("no log message")); // Fire Event - retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIME_AFTER_SAVE, po, null, trx, requestCtx, resp, ret); + retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIMING_AFTER_SAVE, po, null, trx, requestCtx, resp, ret); if (retResp != null) return retResp; @@ -713,7 +713,7 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic Map requestCtx = getRequestCtx(); DataField[] fields = dr.getFieldArray(); - StandardResponseDocument retResp =invokeWSValidator(m_webservicetype, IWSValidator.TIME_BEFORE_PARSE, po, fields,trx,requestCtx, resp, ret); + StandardResponseDocument retResp =invokeWSValidator(m_webservicetype, IWSValidator.TIMING_BEFORE_PARSE, po, fields,trx,requestCtx, resp, ret); if (retResp != null) return retResp; @@ -721,19 +721,19 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic if(retResp!=null) return retResp; - retResp =invokeWSValidator(m_webservicetype, IWSValidator.TIME_AFTER_PARSE, po, fields,trx,requestCtx, resp, ret); + retResp =invokeWSValidator(m_webservicetype, IWSValidator.TIMING_AFTER_PARSE, po, fields,trx,requestCtx, resp, ret); if (retResp != null) return retResp; - retResp =invokeWSValidator(m_webservicetype, IWSValidator.TIME_BEFORE_SAVE, po, fields,trx,requestCtx, resp, ret); + retResp =invokeWSValidator(m_webservicetype, IWSValidator.TIMING_BEFORE_SAVE, po, fields,trx,requestCtx, resp, ret); if (retResp != null) return retResp; if (!po.save()) return rollbackAndSetError(trx, resp, ret, true, "Cannot save record in " + tableName + ": " + CLogger.retrieveErrorString("no log message")); - retResp =invokeWSValidator(m_webservicetype, IWSValidator.TIME_AFTER_SAVE, po, fields,trx,requestCtx, resp, ret); + retResp =invokeWSValidator(m_webservicetype, IWSValidator.TIMING_AFTER_SAVE, po, fields,trx,requestCtx, resp, ret); if (retResp != null) return retResp; @@ -808,7 +808,7 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic MWebServiceType m_webservicetype = getWebServiceType(); Map requestCtx = getRequestCtx(); - StandardResponseDocument retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIME_BEFORE_PARSE, holderPo, fields, trx, + StandardResponseDocument retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIMING_BEFORE_PARSE, holderPo, fields, trx, requestCtx, resp, ret); if (retResp != null) return retResp; @@ -817,7 +817,7 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic if (retResp != null) return retResp; - retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIME_AFTER_PARSE, holderPo, fields, trx, requestCtx, resp, ret); + retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIMING_AFTER_PARSE, holderPo, fields, trx, requestCtx, resp, ret); if (retResp != null) return retResp; @@ -917,7 +917,7 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic } } - retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIME_BEFORE_SAVE, holderPo, fields, trx, requestCtx, resp, ret); + retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIMING_BEFORE_SAVE, holderPo, fields, trx, requestCtx, resp, ret); if (retResp != null) return retResp; @@ -925,7 +925,7 @@ public class ModelADServiceImpl extends AbstractService implements ModelADServic return rollbackAndSetError(trx, resp, ret, true, "Cannot save record in " + tableName + ": " + CLogger.retrieveErrorString("no log message")); - retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIME_AFTER_SAVE, holderPo, fields, trx, requestCtx, resp, ret); + retResp = invokeWSValidator(m_webservicetype, IWSValidator.TIMING_AFTER_SAVE, holderPo, fields, trx, requestCtx, resp, ret); if (retResp != null) return retResp; diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/Process.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/Process.java similarity index 96% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/Process.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/Process.java index 071d689b59..80673cb8c9 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/Process.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/Process.java @@ -1,4 +1,4 @@ -package com._3e.ADInterface; +package org.idempiere.adinterface; import java.io.ByteArrayOutputStream; import java.io.CharArrayWriter; diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ReportEngineEx.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ReportEngineEx.java similarity index 96% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ReportEngineEx.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ReportEngineEx.java index 047deaecfa..5fc397c8c1 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/ReportEngineEx.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/ReportEngineEx.java @@ -1,4 +1,4 @@ -package com._3e.ADInterface; +package org.idempiere.adinterface; import java.io.BufferedWriter; import java.io.File; diff --git a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/WWindowStatus.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/WWindowStatus.java similarity index 95% rename from org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/WWindowStatus.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/WWindowStatus.java index e1958d84e5..2d9043f4cf 100644 --- a/org.idempiere.webservices/WEB-INF/src/com/_3e/ADInterface/WWindowStatus.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/ADInterface/WWindowStatus.java @@ -1,4 +1,4 @@ -package com._3e.ADInterface; +package org.idempiere.adinterface; import java.util.HashMap; import java.util.Map; diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java index 7223b187e2..2018b30ae9 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/AbstractService.java @@ -53,8 +53,8 @@ import org.idempiere.adInterface.x10.OutputField; import org.idempiere.adInterface.x10.OutputFields; import org.idempiere.adInterface.x10.StandardResponse; import org.idempiere.adInterface.x10.StandardResponseDocument; +import org.idempiere.adinterface.CompiereService; -import com._3e.ADInterface.CompiereService; /** @@ -84,7 +84,7 @@ public class AbstractService { && m_cs.getM_AD_Warehouse_ID() == loginRequest.getWarehouseID() && loginRequest.getUser().equals(m_cs.getUser())) return authenticate(webService, method, serviceType, m_cs); // already logged with same data - String ret =invokeLoginValidator(loginRequest, m_cs.getM_ctx(), null, IWSValidator.TIME_BEFORE_LOGIN); + String ret =invokeLoginValidator(loginRequest, m_cs.getM_ctx(), null, IWSValidator.TIMING_BEFORE_LOGIN); if(ret!=null && ret.length()>0) return ret; @@ -158,7 +158,7 @@ public class AbstractService { return "Error logging in - no roles or user/pwd invalid for user " + loginRequest.getUser(); } - ret =invokeLoginValidator(loginRequest, m_cs.getM_ctx(), null, IWSValidator.TIME_AFTER_LOGIN); + ret =invokeLoginValidator(loginRequest, m_cs.getM_ctx(), null, IWSValidator.TIMING_AFTER_LOGIN); if(ret!=null && ret.length()>0) return ret; @@ -213,7 +213,7 @@ public class AbstractService { req.setAttribute("MWebServiceType", m_webservicetype); - String ret=invokeLoginValidator(null, m_cs.getM_ctx(), m_webservicetype, IWSValidator.TIME_ON_AUTHENTICATION); + String ret=invokeLoginValidator(null, m_cs.getM_ctx(), m_webservicetype, IWSValidator.TIMING_ON_AUTHORIZATION); if(ret!=null && ret.length()>0) return ret; diff --git a/org.idempiere.webservices/src/org/idempiere/webservices/Activator.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/Activator.java similarity index 100% rename from org.idempiere.webservices/src/org/idempiere/webservices/Activator.java rename to org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/Activator.java diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/IWSValidator.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/IWSValidator.java index fb48ffae60..630fff3aaf 100644 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/IWSValidator.java +++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/IWSValidator.java @@ -11,17 +11,17 @@ import org.idempiere.adInterface.x10.ADLoginRequest; import org.idempiere.adInterface.x10.DataField; public interface IWSValidator { - public static final int TIME_BEFORE_PARSE=1; - public static final int TIME_AFTER_PARSE=2; - public static final int TIME_BEFORE_SAVE=3; - public static final int TIME_AFTER_SAVE=4; + public static final int TIMING_BEFORE_PARSE=1; + public static final int TIMING_AFTER_PARSE=2; + public static final int TIMING_BEFORE_SAVE=3; + public static final int TIMING_AFTER_SAVE=4; - public static final int TIME_BEFORE_LOGIN=5; - public static final int TIME_AFTER_LOGIN=6; - public static final int TIME_ON_AUTHENTICATION=7; + public static final int TIMING_BEFORE_LOGIN=5; + public static final int TIMING_AFTER_LOGIN=6; + public static final int TIMING_ON_AUTHORIZATION=7; - public static final int TIME_BEFORE_PROCESS=8; - public static final int TIME_AFTER_PROCESS=9; + public static final int TIMING_BEFORE_PROCESS=8; + public static final int TIMING_AFTER_PROCESS=9; public void validate(PO po,MWebServiceType m_webserviceType,DataField[] fields,int time,String trxName,Map requestCtx) throws IdempiereServiceFault; public void login(ADLoginRequest loginRequest,Properties ctx,MWebServiceType m_webserviceType,int time) throws IdempiereServiceFault; diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/WebServiceActivator.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/WebServiceActivator.java deleted file mode 100644 index d9c948cd4e..0000000000 --- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/WebServiceActivator.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.idempiere.webservices; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class WebServiceActivator implements BundleActivator{ - private static BundleContext bundleContext = null; - - /* (non-Javadoc) - * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext) - */ - @Override - public void start(BundleContext context) throws Exception { - bundleContext = context; - } - - /* (non-Javadoc) - * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext) - */ - @Override - public void stop(BundleContext context) throws Exception { - bundleContext = null; - } - - public static BundleContext getBundleContext() { - return bundleContext; - } -} diff --git a/org.idempiere.webservices/WEB-INF/xsd/idempiere-schema.xsd b/org.idempiere.webservices/WEB-INF/xsd/idempiere-schema.xsd index e199e2969a..5b0e478a0d 100644 --- a/org.idempiere.webservices/WEB-INF/xsd/idempiere-schema.xsd +++ b/org.idempiere.webservices/WEB-INF/xsd/idempiere-schema.xsd @@ -4,143 +4,6 @@ xmlns:tns="http://idempiere.org/ADInterface/1_0" elementFormDefault="qualified"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -530,8 +393,8 @@ - - + + diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties index 9fd1f75988..5ff3a31763 100644 --- a/org.idempiere.webservices/build.properties +++ b/org.idempiere.webservices/build.properties @@ -23,7 +23,7 @@ bin.includes = META-INF/,\ WEB-INF/lib/commons-logging-1.1.1.jar,\ WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar,\ WEB-INF/lib/spring-osgi-extender-1.2.1.jar,\ - WEB-INF/lib/Idempiere-XMLSBean-1.0.jar + WEB-INF/lib/idempiere-xmlbeans-1.0.jar src.includes = WEB-INF/classes/,\ WEB-INF/lib/,\ WEB-INF/web.xml,\