You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/08/24 09:03:06 UTC
[GitHub] geertjanw closed pull request #780: [NETBEANS-1175] move
websvccommon cluster
geertjanw closed pull request #780: [NETBEANS-1175] move websvccommon cluster
URL: https://github.com/apache/incubator-netbeans/pull/780
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/nbbuild/rat-exclusions.txt b/nbbuild/rat-exclusions.txt
index 4d14da2ebb..d4320a9df8 100644
--- a/nbbuild/rat-exclusions.txt
+++ b/nbbuild/rat-exclusions.txt
@@ -79,8 +79,8 @@ platform/openide.nodes/test/unit/src/org/openide/nodes/data/**
projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/data/*.txt
platform/queries/test/unit/src/org/netbeans/api/queries/data/*
utilities/test/unit/src/org/netbeans/modules/openfile/resources/recent_files/*
-websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/application.wadl
-websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/rootGroup.xml
+websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/application.wadl
+websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/rootGroup.xml
xml.axi/test/unit/src/org/netbeans/modules/xml/axi/resources/**
xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/resources/*.dtd
xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/resources/*.xml
@@ -120,7 +120,7 @@ mercurial/src/org/netbeans/modules/mercurial/util/log*
properties/src/org/netbeans/modules/properties/sample.properties.template
java/selenium2.java/src/org/netbeans/modules/selenium2/java/SeleneseIT.java.template
java/testng.ui/src/org/netbeans/modules/testng/ui/resources/*.template
-websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/*.template
+websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/*.template
###### do not natively support comments
**/*.mf
@@ -159,9 +159,9 @@ platform/openide.util/test/unit/src/org/openide/util/LookupUsesRequestProcessorT
**/nbproject/groovy-build.xml
**/nbproject/jfx-impl.xml
nbi/engine/nbproject/profiler-build-impl.xml
-websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/jaxb/*
-websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/*
-websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/*
+websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/jaxb/*
+websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/*
+websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/*
### generated ANTLR
java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens
diff --git a/websvc.jaxwsmodelapi/build.xml b/websvccommon/websvc.jaxwsmodelapi/build.xml
similarity index 87%
rename from websvc.jaxwsmodelapi/build.xml
rename to websvccommon/websvc.jaxwsmodelapi/build.xml
index 8752c24b77..5eedae2984 100644
--- a/websvc.jaxwsmodelapi/build.xml
+++ b/websvccommon/websvc.jaxwsmodelapi/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project basedir="." default="build" name="websvc.jaxwsmodelapi">
+<project basedir="." default="build" name="websvccommon/websvc.jaxwsmodelapi">
<description>Builds, tests, and runs the project org.netbeans.modules.websvc.jaxwsmodelapi</description>
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/websvc.jaxwsmodelapi/manifest.mf b/websvccommon/websvc.jaxwsmodelapi/manifest.mf
similarity index 100%
rename from websvc.jaxwsmodelapi/manifest.mf
rename to websvccommon/websvc.jaxwsmodelapi/manifest.mf
diff --git a/websvc.jaxwsmodelapi/nbproject/project.properties b/websvccommon/websvc.jaxwsmodelapi/nbproject/project.properties
similarity index 100%
rename from websvc.jaxwsmodelapi/nbproject/project.properties
rename to websvccommon/websvc.jaxwsmodelapi/nbproject/project.properties
diff --git a/websvc.jaxwsmodelapi/nbproject/project.xml b/websvccommon/websvc.jaxwsmodelapi/nbproject/project.xml
similarity index 100%
rename from websvc.jaxwsmodelapi/nbproject/project.xml
rename to websvccommon/websvc.jaxwsmodelapi/nbproject/project.xml
diff --git a/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/Bundle.properties b/websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/Bundle.properties
similarity index 100%
rename from websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/Bundle.properties
rename to websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/Bundle.properties
diff --git a/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSOperation.java b/websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSOperation.java
similarity index 100%
rename from websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSOperation.java
rename to websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSOperation.java
diff --git a/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSParameter.java b/websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSParameter.java
similarity index 100%
rename from websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSParameter.java
rename to websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSParameter.java
diff --git a/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSPort.java b/websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSPort.java
similarity index 100%
rename from websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSPort.java
rename to websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSPort.java
diff --git a/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSReference.java b/websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSReference.java
similarity index 100%
rename from websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSReference.java
rename to websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSReference.java
diff --git a/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSService.java b/websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSService.java
similarity index 100%
rename from websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSService.java
rename to websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSService.java
diff --git a/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSTransferable.java b/websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSTransferable.java
similarity index 100%
rename from websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSTransferable.java
rename to websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/WSTransferable.java
diff --git a/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/java/JavaMethod.java b/websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/java/JavaMethod.java
similarity index 100%
rename from websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/java/JavaMethod.java
rename to websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/java/JavaMethod.java
diff --git a/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/java/JavaParameter.java b/websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/java/JavaParameter.java
similarity index 100%
rename from websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/java/JavaParameter.java
rename to websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/java/JavaParameter.java
diff --git a/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/java/JavaType.java b/websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/java/JavaType.java
similarity index 100%
rename from websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/java/JavaType.java
rename to websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/java/JavaType.java
diff --git a/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/wsdlmodel/WsdlModel.java b/websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/wsdlmodel/WsdlModel.java
similarity index 100%
rename from websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/wsdlmodel/WsdlModel.java
rename to websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/wsdlmodel/WsdlModel.java
diff --git a/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/wsdlmodel/WsdlModelProvider.java b/websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/wsdlmodel/WsdlModelProvider.java
similarity index 100%
rename from websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/wsdlmodel/WsdlModelProvider.java
rename to websvccommon/websvc.jaxwsmodelapi/src/org/netbeans/modules/websvc/jaxwsmodelapi/wsdlmodel/WsdlModelProvider.java
diff --git a/websvc.saas.api/build.xml b/websvccommon/websvc.saas.api/build.xml
similarity index 96%
rename from websvc.saas.api/build.xml
rename to websvccommon/websvc.saas.api/build.xml
index d23eaa0a01..5536e08df9 100644
--- a/websvc.saas.api/build.xml
+++ b/websvccommon/websvc.saas.api/build.xml
@@ -21,9 +21,9 @@
-->
-<project basedir="." default="build" name="websvc.saas.api">
+<project basedir="." default="build" name="websvccommon/websvc.saas.api">
<description>Builds, tests, and runs the project org.netbeans.modules.websvc.saas.api</description>
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
<property name="saas.service.xsd" value="src/org/netbeans/modules/websvc/saas/model/SaasServices.xsd"/>
<property name="saas.model.jaxb" value="src/org/netbeans/modules/websvc/saas/model/jaxb"/>
diff --git a/websvc.saas.api/licenseinfo.xml b/websvccommon/websvc.saas.api/licenseinfo.xml
similarity index 100%
rename from websvc.saas.api/licenseinfo.xml
rename to websvccommon/websvc.saas.api/licenseinfo.xml
diff --git a/websvc.saas.api/manifest.mf b/websvccommon/websvc.saas.api/manifest.mf
similarity index 100%
rename from websvc.saas.api/manifest.mf
rename to websvccommon/websvc.saas.api/manifest.mf
diff --git a/websvc.saas.api/nbproject/project.properties b/websvccommon/websvc.saas.api/nbproject/project.properties
similarity index 100%
rename from websvc.saas.api/nbproject/project.properties
rename to websvccommon/websvc.saas.api/nbproject/project.properties
diff --git a/websvc.saas.api/nbproject/project.xml b/websvccommon/websvc.saas.api/nbproject/project.xml
similarity index 100%
rename from websvc.saas.api/nbproject/project.xml
rename to websvccommon/websvc.saas.api/nbproject/project.xml
diff --git a/websvc.saas.api/release/modules/ext/build-jaxb.xml b/websvccommon/websvc.saas.api/release/modules/ext/build-jaxb.xml
similarity index 100%
rename from websvc.saas.api/release/modules/ext/build-jaxb.xml
rename to websvccommon/websvc.saas.api/release/modules/ext/build-jaxb.xml
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/Bundle.properties b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/Bundle.properties
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/Bundle.properties
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/Bundle.properties
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/CustomSaas.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/CustomSaas.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/CustomSaas.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/CustomSaas.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/CustomSaasMethod.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/CustomSaasMethod.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/CustomSaasMethod.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/CustomSaasMethod.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/Saas.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/Saas.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/Saas.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/Saas.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasCatalog.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasCatalog.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasCatalog.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasCatalog.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasGroup.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasGroup.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasGroup.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasGroup.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasMethod.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasMethod.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasMethod.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasMethod.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasServices.xsd b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasServices.xsd
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasServices.xsd
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasServices.xsd
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasServicesModel.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasServicesModel.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasServicesModel.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasServicesModel.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WadlSaas.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WadlSaas.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WadlSaas.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WadlSaas.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WadlSaasMethod.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WadlSaasMethod.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WadlSaasMethod.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WadlSaasMethod.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WadlSaasResource.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WadlSaasResource.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WadlSaasResource.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WadlSaasResource.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WsdlSaas.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WsdlSaas.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WsdlSaas.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WsdlSaas.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WsdlSaasMethod.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WsdlSaasMethod.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WsdlSaasMethod.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WsdlSaasMethod.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WsdlSaasPort.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WsdlSaasPort.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WsdlSaasPort.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/WsdlSaasPort.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/layer.xml b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/layer.xml
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/layer.xml
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/layer.xml
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth-metadata.xsd b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth-metadata.xsd
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth-metadata.xsd
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth-metadata.xsd
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/Utils.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/Utils.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/Utils.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/Utils.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlErrorHandler.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlErrorHandler.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlErrorHandler.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlErrorHandler.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModel.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModel.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModel.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModel.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModelListener.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModelListener.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModelListener.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModelListener.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModeler.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModeler.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModeler.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModeler.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModelerFactory.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModelerFactory.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModelerFactory.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlModelerFactory.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlOperation.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlOperation.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlOperation.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlOperation.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlParameter.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlParameter.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlParameter.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlParameter.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlPort.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlPort.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlPort.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlPort.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlService.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlService.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlService.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wsdl/impl/WsdlService.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/OAuthAuthorizationPanelNb.template b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/OAuthAuthorizationPanelNb.template
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/OAuthAuthorizationPanelNb.template
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/OAuthAuthorizationPanelNb.template
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/OAuthSearchJSON.template b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/OAuthSearchJSON.template
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/OAuthSearchJSON.template
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/OAuthSearchJSON.template
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/OAuthSearchXML.template b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/OAuthSearchXML.template
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/OAuthSearchXML.template
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/OAuthSearchXML.template
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/Bundle.properties b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/Bundle.properties
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/Bundle.properties
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/Bundle.properties
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/ConsumerFlavorProvider.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/ConsumerFlavorProvider.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/ConsumerFlavorProvider.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/ConsumerFlavorProvider.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/MethodNodeActionsProvider.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/MethodNodeActionsProvider.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/MethodNodeActionsProvider.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/MethodNodeActionsProvider.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/SaasNodeActionsProvider.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/SaasNodeActionsProvider.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/SaasNodeActionsProvider.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/SaasNodeActionsProvider.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/SaasViewProvider.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/SaasViewProvider.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/SaasViewProvider.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/SaasViewProvider.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/ServiceData.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/ServiceData.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/ServiceData.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/ServiceData.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlData.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlData.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlData.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlData.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlDataManager.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlDataManager.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlDataManager.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlDataManager.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlServiceData.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlServiceData.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlServiceData.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlServiceData.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlServiceProxyDescriptor.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlServiceProxyDescriptor.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlServiceProxyDescriptor.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlServiceProxyDescriptor.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/Bundle.properties b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/Bundle.properties
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/Bundle.properties
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/Bundle.properties
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/SaasTransferable.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/SaasTransferable.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/SaasTransferable.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/SaasTransferable.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/SaasUtil.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/SaasUtil.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/SaasUtil.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/SaasUtil.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/TypeUtil.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/TypeUtil.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/TypeUtil.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/TypeUtil.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/WsdlUtil.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/WsdlUtil.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/WsdlUtil.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/util/WsdlUtil.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/Bundle.properties b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/Bundle.properties
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/Bundle.properties
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/Bundle.properties
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WebServiceListManager.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WebServiceListManager.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WebServiceListManager.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WebServiceListManager.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WebServiceManager.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WebServiceManager.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WebServiceManager.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WebServiceManager.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WsdlDataImpl.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WsdlDataImpl.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WsdlDataImpl.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WsdlDataImpl.java
diff --git a/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WsdlDataManagerImpl.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WsdlDataManagerImpl.java
similarity index 100%
rename from websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WsdlDataManagerImpl.java
rename to websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/wsdl/websvcmgr/WsdlDataManagerImpl.java
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/SaasServicesModelTest.java b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/SaasServicesModelTest.java
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/SaasServicesModelTest.java
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/SaasServicesModelTest.java
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/WadlSaasMethodTest.java b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/WadlSaasMethodTest.java
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/WadlSaasMethodTest.java
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/WadlSaasMethodTest.java
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/WadlSaasTest.java b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/WadlSaasTest.java
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/WadlSaasTest.java
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/WadlSaasTest.java
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/application.wadl b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/application.wadl
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/application.wadl
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/application.wadl
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/DialogDisplayerNotifier.java b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/DialogDisplayerNotifier.java
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/DialogDisplayerNotifier.java
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/DialogDisplayerNotifier.java
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/InstalledFileLocatorImpl.java b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/InstalledFileLocatorImpl.java
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/InstalledFileLocatorImpl.java
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/InstalledFileLocatorImpl.java
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SaasUtilTest.java b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SaasUtilTest.java
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SaasUtilTest.java
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SaasUtilTest.java
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SchemaTestBase.java b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SchemaTestBase.java
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SchemaTestBase.java
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SchemaTestBase.java
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SetupData.java b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SetupData.java
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SetupData.java
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SetupData.java
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SetupUtil.java b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SetupUtil.java
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SetupUtil.java
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/SetupUtil.java
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/TestRetriever.java b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/TestRetriever.java
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/TestRetriever.java
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/TestRetriever.java
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/rootGroup.xml b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/rootGroup.xml
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/rootGroup.xml
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/rootGroup.xml
diff --git a/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/testwadl.xml b/websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/testwadl.xml
similarity index 100%
rename from websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/testwadl.xml
rename to websvccommon/websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/testwadl.xml
diff --git a/websvc.saas.codegen/build.xml b/websvccommon/websvc.saas.codegen/build.xml
similarity index 87%
rename from websvc.saas.codegen/build.xml
rename to websvccommon/websvc.saas.codegen/build.xml
index 0c75de4969..923f7ce797 100644
--- a/websvc.saas.codegen/build.xml
+++ b/websvccommon/websvc.saas.codegen/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project basedir="." default="build" name="websvc.saas.codegen">
+<project basedir="." default="build" name="websvccommon/websvc.saas.codegen">
<description>Builds, tests, and runs the project org.netbeans.modules.websvc.saas.codegen</description>
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/websvc.saas.codegen/manifest.mf b/websvccommon/websvc.saas.codegen/manifest.mf
similarity index 100%
rename from websvc.saas.codegen/manifest.mf
rename to websvccommon/websvc.saas.codegen/manifest.mf
diff --git a/websvc.saas.codegen/nbproject/project.properties b/websvccommon/websvc.saas.codegen/nbproject/project.properties
similarity index 100%
rename from websvc.saas.codegen/nbproject/project.properties
rename to websvccommon/websvc.saas.codegen/nbproject/project.properties
diff --git a/websvc.saas.codegen/nbproject/project.xml b/websvccommon/websvc.saas.codegen/nbproject/project.xml
similarity index 100%
rename from websvc.saas.codegen/nbproject/project.xml
rename to websvccommon/websvc.saas.codegen/nbproject/project.xml
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/Bundle.properties b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/Bundle.properties
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/Bundle.properties
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/Bundle.properties
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/Constants.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/Constants.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/Constants.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/Constants.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientAuthenticationGenerator.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientAuthenticationGenerator.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientAuthenticationGenerator.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientAuthenticationGenerator.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerationManager.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerationManager.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerationManager.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerationManager.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerator.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerator.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerator.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerator.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/CustomClientSaasBean.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/CustomClientSaasBean.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/CustomClientSaasBean.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/CustomClientSaasBean.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/GenericResourceBean.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/GenericResourceBean.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/GenericResourceBean.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/GenericResourceBean.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/ParameterInfo.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/ParameterInfo.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/ParameterInfo.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/ParameterInfo.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/RestClientSaasBean.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/RestClientSaasBean.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/RestClientSaasBean.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/RestClientSaasBean.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SaasBean.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SaasBean.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SaasBean.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SaasBean.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SoapClientOperationInfo.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SoapClientOperationInfo.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SoapClientOperationInfo.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SoapClientOperationInfo.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SoapClientSaasBean.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SoapClientSaasBean.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SoapClientSaasBean.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/model/SoapClientSaasBean.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/spi/SaasClientCodeGenerationProvider.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/spi/SaasClientCodeGenerationProvider.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/spi/SaasClientCodeGenerationProvider.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/spi/SaasClientCodeGenerationProvider.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/Bundle.properties b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/Bundle.properties
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/Bundle.properties
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/Bundle.properties
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CodeSetupPanel.form b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CodeSetupPanel.form
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CodeSetupPanel.form
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CodeSetupPanel.form
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CodeSetupPanel.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CodeSetupPanel.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CodeSetupPanel.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CodeSetupPanel.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CustomClientEditorDrop.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CustomClientEditorDrop.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CustomClientEditorDrop.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CustomClientEditorDrop.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CustomClientFlavorProvider.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CustomClientFlavorProvider.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CustomClientFlavorProvider.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/CustomClientFlavorProvider.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/ProgressDialog.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/ProgressDialog.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/ProgressDialog.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/ProgressDialog.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/RestClientEditorDrop.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/RestClientEditorDrop.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/RestClientEditorDrop.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/RestClientEditorDrop.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/RestClientFlavorProvider.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/RestClientFlavorProvider.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/RestClientFlavorProvider.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/RestClientFlavorProvider.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/SoapClientEditorDrop.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/SoapClientEditorDrop.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/SoapClientEditorDrop.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/SoapClientEditorDrop.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/SoapClientFlavorProvider.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/SoapClientFlavorProvider.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/SoapClientFlavorProvider.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/SoapClientFlavorProvider.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/SoapServiceClientEditorDrop.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/SoapServiceClientEditorDrop.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/SoapServiceClientEditorDrop.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/ui/SoapServiceClientEditorDrop.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/UniqueVariableNameFinder.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/UniqueVariableNameFinder.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/UniqueVariableNameFinder.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/UniqueVariableNameFinder.java
diff --git a/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Util.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Util.java
similarity index 100%
rename from websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Util.java
rename to websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Util.java
diff --git a/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/InstalledFileLocatorImpl.java b/websvccommon/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/InstalledFileLocatorImpl.java
similarity index 100%
rename from websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/InstalledFileLocatorImpl.java
rename to websvccommon/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/InstalledFileLocatorImpl.java
diff --git a/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/JavaApplication.zip b/websvccommon/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/JavaApplication.zip
similarity index 100%
rename from websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/JavaApplication.zip
rename to websvccommon/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/JavaApplication.zip
diff --git a/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/JavaCodeGenerationTest.java b/websvccommon/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/JavaCodeGenerationTest.java
similarity index 100%
rename from websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/JavaCodeGenerationTest.java
rename to websvccommon/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/JavaCodeGenerationTest.java
diff --git a/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerationProviderTest.java b/websvccommon/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerationProviderTest.java
similarity index 100%
rename from websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerationProviderTest.java
rename to websvccommon/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerationProviderTest.java
diff --git a/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/SetupUtil.java b/websvccommon/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/SetupUtil.java
similarity index 100%
rename from websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/SetupUtil.java
rename to websvccommon/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/SetupUtil.java
diff --git a/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/TestUtils.java b/websvccommon/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/TestUtils.java
similarity index 100%
rename from websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/TestUtils.java
rename to websvccommon/websvc.saas.codegen/test/unit/src/org/netbeans/modules/websvc/saas/codegen/TestUtils.java
diff --git a/websvc.saas.kit/build.xml b/websvccommon/websvc.saas.kit/build.xml
similarity index 95%
rename from websvc.saas.kit/build.xml
rename to websvccommon/websvc.saas.kit/build.xml
index 134d58f02a..34ed5a3643 100644
--- a/websvc.saas.kit/build.xml
+++ b/websvccommon/websvc.saas.kit/build.xml
@@ -19,9 +19,9 @@
under the License.
-->
-<project basedir="." default="build" name="websvc.saas.kit">
+<project basedir="." default="build" name="websvccommon/websvc.saas.kit">
<description>Builds, tests, and runs the project org.netbeans.modules.websvc.saas.kit</description>
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
<target name="all-saas">
<antcall target="netbeans"/>
diff --git a/websvc.saas.kit/manifest.mf b/websvccommon/websvc.saas.kit/manifest.mf
similarity index 100%
rename from websvc.saas.kit/manifest.mf
rename to websvccommon/websvc.saas.kit/manifest.mf
diff --git a/websvc.saas.kit/nbproject/project.properties b/websvccommon/websvc.saas.kit/nbproject/project.properties
similarity index 100%
rename from websvc.saas.kit/nbproject/project.properties
rename to websvccommon/websvc.saas.kit/nbproject/project.properties
diff --git a/websvc.saas.kit/nbproject/project.xml b/websvccommon/websvc.saas.kit/nbproject/project.xml
similarity index 100%
rename from websvc.saas.kit/nbproject/project.xml
rename to websvccommon/websvc.saas.kit/nbproject/project.xml
diff --git a/websvc.saas.kit/release/VERSION.txt b/websvccommon/websvc.saas.kit/release/VERSION.txt
similarity index 100%
rename from websvc.saas.kit/release/VERSION.txt
rename to websvccommon/websvc.saas.kit/release/VERSION.txt
diff --git a/websvc.saas.kit/src/org/netbeans/modules/websvc/saas/kit/Bundle.properties b/websvccommon/websvc.saas.kit/src/org/netbeans/modules/websvc/saas/kit/Bundle.properties
similarity index 100%
rename from websvc.saas.kit/src/org/netbeans/modules/websvc/saas/kit/Bundle.properties
rename to websvccommon/websvc.saas.kit/src/org/netbeans/modules/websvc/saas/kit/Bundle.properties
diff --git a/websvc.saas.ui/build.xml b/websvccommon/websvc.saas.ui/build.xml
similarity index 87%
rename from websvc.saas.ui/build.xml
rename to websvccommon/websvc.saas.ui/build.xml
index a12ab0bc3d..29583c4f57 100644
--- a/websvc.saas.ui/build.xml
+++ b/websvccommon/websvc.saas.ui/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project basedir="." default="build" name="websvc.saas.ui">
+<project basedir="." default="build" name="websvccommon/websvc.saas.ui">
<description>Builds, tests, and runs the project org.netbeans.modules.websvc.saas.ui</description>
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/websvc.saas.ui/licenseinfo.xml b/websvccommon/websvc.saas.ui/licenseinfo.xml
similarity index 100%
rename from websvc.saas.ui/licenseinfo.xml
rename to websvccommon/websvc.saas.ui/licenseinfo.xml
diff --git a/websvc.saas.ui/manifest.mf b/websvccommon/websvc.saas.ui/manifest.mf
similarity index 100%
rename from websvc.saas.ui/manifest.mf
rename to websvccommon/websvc.saas.ui/manifest.mf
diff --git a/websvc.saas.ui/nbproject/project.properties b/websvccommon/websvc.saas.ui/nbproject/project.properties
similarity index 100%
rename from websvc.saas.ui/nbproject/project.properties
rename to websvccommon/websvc.saas.ui/nbproject/project.properties
diff --git a/websvc.saas.ui/nbproject/project.xml b/websvccommon/websvc.saas.ui/nbproject/project.xml
similarity index 100%
rename from websvc.saas.ui/nbproject/project.xml
rename to websvccommon/websvc.saas.ui/nbproject/project.xml
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/Bundle.properties b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/Bundle.properties
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/Bundle.properties
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/Bundle.properties
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/AddGroupAction.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/AddGroupAction.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/AddGroupAction.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/AddGroupAction.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/AddServiceAction.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/AddServiceAction.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/AddServiceAction.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/AddServiceAction.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/Bundle.properties b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/Bundle.properties
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/Bundle.properties
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/Bundle.properties
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/DeleteGroupAction.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/DeleteGroupAction.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/DeleteGroupAction.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/DeleteGroupAction.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/DeleteServiceAction.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/DeleteServiceAction.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/DeleteServiceAction.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/DeleteServiceAction.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/RefreshServiceAction.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/RefreshServiceAction.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/RefreshServiceAction.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/RefreshServiceAction.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/RenameGroupAction.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/RenameGroupAction.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/RenameGroupAction.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/RenameGroupAction.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/ViewApiDocAction.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/ViewApiDocAction.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/ViewApiDocAction.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/ViewApiDocAction.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/ViewWSDLAction.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/ViewWSDLAction.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/ViewWSDLAction.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/ViewWSDLAction.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/ViewWadlAction.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/ViewWadlAction.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/ViewWadlAction.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/actions/ViewWadlAction.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/Bundle.properties b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/Bundle.properties
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/Bundle.properties
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/Bundle.properties
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/CustomMethodNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/CustomMethodNode.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/CustomMethodNode.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/CustomMethodNode.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/CustomSaasNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/CustomSaasNode.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/CustomSaasNode.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/CustomSaasNode.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/CustomSaasNodeChildren.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/CustomSaasNodeChildren.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/CustomSaasNodeChildren.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/CustomSaasNodeChildren.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/ResourceNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/ResourceNode.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/ResourceNode.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/ResourceNode.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/ResourceNodeChildren.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/ResourceNodeChildren.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/ResourceNodeChildren.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/ResourceNodeChildren.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasGroupNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasGroupNode.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasGroupNode.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasGroupNode.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasGroupNodeChildren.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasGroupNodeChildren.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasGroupNodeChildren.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasGroupNodeChildren.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasMethodNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasMethodNode.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasMethodNode.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasMethodNode.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasNode.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasNode.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasNode.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasNodeChildren.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasNodeChildren.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasNodeChildren.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasNodeChildren.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasServicesRootNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasServicesRootNode.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasServicesRootNode.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasServicesRootNode.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasView.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasView.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasView.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasView.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WadlMethodNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WadlMethodNode.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WadlMethodNode.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WadlMethodNode.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WadlSaasNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WadlSaasNode.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WadlSaasNode.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WadlSaasNode.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WadlSaasNodeChildren.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WadlSaasNodeChildren.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WadlSaasNodeChildren.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WadlSaasNodeChildren.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlMethodNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlMethodNode.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlMethodNode.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlMethodNode.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlPortNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlPortNode.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlPortNode.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlPortNode.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlPortNodeChildren.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlPortNodeChildren.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlPortNodeChildren.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlPortNodeChildren.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlSaasNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlSaasNode.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlSaasNode.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlSaasNode.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlSaasNodeChildren.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlSaasNodeChildren.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlSaasNodeChildren.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/WsdlSaasNodeChildren.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/ActionIcon.gif b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/ActionIcon.gif
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/ActionIcon.gif
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/ActionIcon.gif
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/custom_service.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/custom_service.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/custom_service.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/custom_service.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/folder-closed.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/folder-closed.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/folder-closed.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/folder-closed.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/folder-open.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/folder-open.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/folder-open.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/folder-open.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/method.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/method.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/method.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/method.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/methodicon.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/methodicon.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/methodicon.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/methodicon.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/restservice.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/restservice.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/restservice.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/restservice.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/table_dp_badge.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/table_dp_badge.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/table_dp_badge.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/table_dp_badge.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/wait.gif b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/wait.gif
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/wait.gif
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/wait.gif
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/warning.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/warning.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/warning.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/warning.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/webservice.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/webservice.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/webservice.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/webservice.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/webservice24.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/webservice24.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/webservice24.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/webservice24.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/webservicegroup.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/webservicegroup.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/webservicegroup.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/webservicegroup.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/wsport-closed.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/wsport-closed.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/wsport-closed.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/wsport-closed.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/wsport-open.png b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/wsport-open.png
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/wsport-open.png
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/resources/wsport-open.png
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/wizards/AddWebServiceDlg.form b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/wizards/AddWebServiceDlg.form
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/wizards/AddWebServiceDlg.form
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/wizards/AddWebServiceDlg.form
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/wizards/AddWebServiceDlg.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/wizards/AddWebServiceDlg.java
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/wizards/AddWebServiceDlg.java
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/wizards/AddWebServiceDlg.java
diff --git a/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/wizards/Bundle.properties b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/wizards/Bundle.properties
similarity index 100%
rename from websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/wizards/Bundle.properties
rename to websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/wizards/Bundle.properties
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists