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/09/15 12:28:10 UTC
[GitHub] geertjanw closed pull request #880: [NETBEANS-1254] Move
svnkit+hibernateweb modules into a subdirectory
geertjanw closed pull request #880: [NETBEANS-1254] Move svnkit+hibernateweb modules into a subdirectory
URL: https://github.com/apache/incubator-netbeans/pull/880
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/hibernateweb/build.xml b/enterprise/hibernateweb/build.xml
similarity index 88%
rename from hibernateweb/build.xml
rename to enterprise/hibernateweb/build.xml
index 974b6e45c0..2b6789087a 100644
--- a/hibernateweb/build.xml
+++ b/enterprise/hibernateweb/build.xml
@@ -20,7 +20,7 @@
-->
-<project name="hibernateweb" default="netbeans" basedir=".">
+<project name="enterprise/hibernateweb" default="build" basedir=".">
<description>Builds, tests, and runs the project hibernateweb.</description>
- <import file="../nbbuild/templates/projectized.xml"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/hibernateweb/manifest.mf b/enterprise/hibernateweb/manifest.mf
similarity index 100%
rename from hibernateweb/manifest.mf
rename to enterprise/hibernateweb/manifest.mf
diff --git a/hibernateweb/nbproject/project.properties b/enterprise/hibernateweb/nbproject/project.properties
similarity index 100%
rename from hibernateweb/nbproject/project.properties
rename to enterprise/hibernateweb/nbproject/project.properties
diff --git a/hibernateweb/nbproject/project.xml b/enterprise/hibernateweb/nbproject/project.xml
similarity index 100%
rename from hibernateweb/nbproject/project.xml
rename to enterprise/hibernateweb/nbproject/project.xml
diff --git a/hibernateweb/src/org/netbeans/modules/hibernateweb/Bundle.properties b/enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/Bundle.properties
similarity index 100%
rename from hibernateweb/src/org/netbeans/modules/hibernateweb/Bundle.properties
rename to enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/Bundle.properties
diff --git a/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/Bundle.properties b/enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/Bundle.properties
similarity index 100%
rename from hibernateweb/src/org/netbeans/modules/hibernateweb/framework/Bundle.properties
rename to enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/Bundle.properties
diff --git a/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateConfigurationPanel.form b/enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateConfigurationPanel.form
similarity index 100%
rename from hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateConfigurationPanel.form
rename to enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateConfigurationPanel.form
diff --git a/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateConfigurationPanel.java b/enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateConfigurationPanel.java
similarity index 100%
rename from hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateConfigurationPanel.java
rename to enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateConfigurationPanel.java
diff --git a/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateFrameworkProvider.java b/enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateFrameworkProvider.java
similarity index 100%
rename from hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateFrameworkProvider.java
rename to enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateFrameworkProvider.java
diff --git a/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateWebModuleExtender.java b/enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateWebModuleExtender.java
similarity index 100%
rename from hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateWebModuleExtender.java
rename to enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateWebModuleExtender.java
diff --git a/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/Util.java b/enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/Util.java
similarity index 100%
rename from hibernateweb/src/org/netbeans/modules/hibernateweb/framework/Util.java
rename to enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/Util.java
diff --git a/hibernateweb/src/org/netbeans/modules/hibernateweb/resources/layer.xml b/enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/resources/layer.xml
similarity index 100%
rename from hibernateweb/src/org/netbeans/modules/hibernateweb/resources/layer.xml
rename to enterprise/hibernateweb/src/org/netbeans/modules/hibernateweb/resources/layer.xml
diff --git a/libs.svnClientAdapter.svnkit/build.xml b/ide/libs.svnClientAdapter.svnkit/build.xml
similarity index 86%
rename from libs.svnClientAdapter.svnkit/build.xml
rename to ide/libs.svnClientAdapter.svnkit/build.xml
index bbec47a554..579b008e10 100644
--- a/libs.svnClientAdapter.svnkit/build.xml
+++ b/ide/libs.svnClientAdapter.svnkit/build.xml
@@ -19,6 +19,6 @@
under the License.
-->
-<project name="libs.svnClientAdapter.svnkit" default="build" basedir=".">
- <import file="../nbbuild/templates/projectized.xml"/>
+<project name="ide/libs.svnClientAdapter.svnkit" default="build" basedir=".">
+ <import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/libs.svnClientAdapter.svnkit/external/binaries-list b/ide/libs.svnClientAdapter.svnkit/external/binaries-list
similarity index 100%
rename from libs.svnClientAdapter.svnkit/external/binaries-list
rename to ide/libs.svnClientAdapter.svnkit/external/binaries-list
diff --git a/libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733-license.txt b/ide/libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733-license.txt
similarity index 100%
rename from libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733-license.txt
rename to ide/libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build220_r167_v20150618_1733-license.txt
diff --git a/libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158-license.txt b/ide/libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158-license.txt
similarity index 100%
rename from libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158-license.txt
rename to ide/libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.12.r10533_v20160129_0158-license.txt
diff --git a/libs.svnClientAdapter.svnkit/external/sqljet-1.1.10-license.txt b/ide/libs.svnClientAdapter.svnkit/external/sqljet-1.1.10-license.txt
similarity index 100%
rename from libs.svnClientAdapter.svnkit/external/sqljet-1.1.10-license.txt
rename to ide/libs.svnClientAdapter.svnkit/external/sqljet-1.1.10-license.txt
diff --git a/libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12-license.txt b/ide/libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12-license.txt
similarity index 100%
rename from libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12-license.txt
rename to ide/libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.12-license.txt
diff --git a/libs.svnClientAdapter.svnkit/manifest.mf b/ide/libs.svnClientAdapter.svnkit/manifest.mf
similarity index 100%
rename from libs.svnClientAdapter.svnkit/manifest.mf
rename to ide/libs.svnClientAdapter.svnkit/manifest.mf
diff --git a/libs.svnClientAdapter.svnkit/nbproject/project.properties b/ide/libs.svnClientAdapter.svnkit/nbproject/project.properties
similarity index 100%
rename from libs.svnClientAdapter.svnkit/nbproject/project.properties
rename to ide/libs.svnClientAdapter.svnkit/nbproject/project.properties
diff --git a/libs.svnClientAdapter.svnkit/nbproject/project.xml b/ide/libs.svnClientAdapter.svnkit/nbproject/project.xml
similarity index 100%
rename from libs.svnClientAdapter.svnkit/nbproject/project.xml
rename to ide/libs.svnClientAdapter.svnkit/nbproject/project.xml
diff --git a/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/Bundle.properties b/ide/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/Bundle.properties
similarity index 100%
rename from libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/Bundle.properties
rename to ide/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/Bundle.properties
diff --git a/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java b/ide/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
similarity index 100%
rename from libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
rename to ide/libs.svnClientAdapter.svnkit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactory.java
diff --git a/libs.svnClientAdapter.svnkit/test/unit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactoryTest.java b/ide/libs.svnClientAdapter.svnkit/test/unit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactoryTest.java
similarity index 100%
rename from libs.svnClientAdapter.svnkit/test/unit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactoryTest.java
rename to ide/libs.svnClientAdapter.svnkit/test/unit/src/org/netbeans/libs/svnclientadapter/svnkit/SvnKitClientAdapterFactoryTest.java
----------------------------------------------------------------
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