Index: enterprise/compapp/jbimanager/nbproject/project.xml
===================================================================
RCS file: /cvs/enterprise/compapp/jbimanager/nbproject/Attic/project.xml,v
retrieving revision 1.15
diff -u -6 -r1.15 project.xml
--- enterprise/compapp/jbimanager/nbproject/project.xml 16 Oct 2007 20:38:42 -0000 1.15
+++ enterprise/compapp/jbimanager/nbproject/project.xml 28 Feb 2008 15:13:56 -0000
@@ -71,12 +71,19 @@
1
1.5
+ org.netbeans.modules.j2ee.sun.appsrv81
+
+ 1
+ 1.4.2
+
+
+
org.netbeans.modules.j2eeapis
1
1.7
Index: enterprise/compapp/projectjbi/nbproject/project.xml
===================================================================
RCS file: /cvs/enterprise/compapp/projectjbi/nbproject/Attic/project.xml,v
retrieving revision 1.22
diff -u -6 -r1.22 project.xml
--- enterprise/compapp/projectjbi/nbproject/project.xml 12 Sep 2007 10:18:30 -0000 1.22
+++ enterprise/compapp/projectjbi/nbproject/project.xml 28 Feb 2008 15:13:57 -0000
@@ -53,20 +53,12 @@
3
3.23.1.1
- org.apache.xml.resolver
-
-
-
- 1.1.21
-
-
-
org.jdesktop.layout
1
1.3.1
Index: enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/JbiProject.java
===================================================================
RCS file: /cvs/enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/Attic/JbiProject.java,v
retrieving revision 1.14
diff -u -6 -r1.14 JbiProject.java
--- enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/JbiProject.java 1 Nov 2007 19:00:04 -0000 1.14
+++ enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/JbiProject.java 28 Feb 2008 15:13:57 -0000
@@ -114,23 +114,38 @@
*/
public static final String SOURCES_TYPE_JBI = "JBI"; // NOI18N
/**
* DOCUMENT ME!
*/
- public static final String MODULE_INSTALL_NAME = "modules/org-netbeans-modules-compapp-projects-jbi.jar"; // NOI18N
+ //public static final String MODULE_INSTALL_NAME = "modules/org-netbeans-modules-compapp-projects-jbi.jar"; // NOI18N
+ public static final String JAVA_MODULE_INSTALL_NAME = "modules/org-netbeans-modules-junit.jar"; // NOI18N
+ public static final String ENTERPRISE_MODULE_INSTALL_NAME = "modules/org-netbeans-modules-j2ee-sun-appsrv.jar"; // NOI18N
+ public static final String XML_MODULE_INSTALL_NAME = "modules/org-netbeans-modules-xml-wsdl-extensions.jar"; // NOI18N
+ public static final String IDE_MODULE_INSTALL_NAME = "modules/org-netbeans-modules-xml-wsdl-model.jar"; // NOI18N
+ public static final String SOA_MODULE_INSTALL_NAME = "modules/org-netbeans-modules-compapp-projects-jbi.jar"; // NOI18N
/**
* DOCUMENT ME!
*/
- public static final String MODULE_INSTALL_CBN = "org.netbeans.modules.compapp.projects.jbi"; // NOI18N
+ //public static final String MODULE_INSTALL_CBN = "org.netbeans.modules.compapp.projects.jbi"; // NOI18N
+ public static final String JAVA_MODULE_INSTALL_CBN = "org.netbeans.modules.junit"; // NOI18N
+ public static final String ENTERPRISE_MODULE_INSTALL_CBN = "org.netbeans.modules.j2ee.sun.api"; // NOI18N
+ public static final String XML_MODULE_INSTALL_CBN = "org.netbeans.modules.xml.wsdl.model.extensions"; // NOI18N
+ public static final String IDE_MODULE_INSTALL_CBN = "org.netbeans.modules.xml.wsdl.model"; // NOI18N
+ public static final String SOA_MODULE_INSTALL_CBN = "org.netbeans.modules.compapp.projects.jbi"; // NOI18N
/**
* DOCUMENT ME!
*/
- public static final String MODULE_INSTALL_DIR = "module.install.dir"; // NOI18N
+ //public static final String MODULE_INSTALL_DIR = "module.install.dir"; // NOI18N
+ public static final String JAVA_MODULE_INSTALL_DIR = "java.module.install.dir"; // NOI18N
+ public static final String ENTERPRISE_MODULE_INSTALL_DIR = "enterprise.module.install.dir"; // NOI18N
+ public static final String XML_MODULE_INSTALL_DIR = "xml.module.install.dir"; // NOI18N
+ public static final String IDE_MODULE_INSTALL_DIR = "ide.module.install.dir"; // NOI18N
+ public static final String SOA_MODULE_INSTALL_DIR = "soa.module.install.dir"; // NOI18N
// /** Last time in ms when the Broken References alert was shown. */
// private static long brokenAlertLastTime = 0;
//
// /** Is Broken References alert shown now? */
// private static boolean brokenAlertShown = false;
@@ -663,16 +678,42 @@
// 4. Set private properties
EditableProperties privateEP = helper.getProperties(
AntProjectHelper.PRIVATE_PROPERTIES_PATH);
privateEP.setProperty(
"netbeans.user", System.getProperty("netbeans.user")); // NOI18N
- File f = InstalledFileLocator.getDefault().locate(
- MODULE_INSTALL_NAME, MODULE_INSTALL_CBN, false);
+ InstalledFileLocator installedFileLocator = InstalledFileLocator.getDefault();
+
+ File f = installedFileLocator.locate(
+ SOA_MODULE_INSTALL_NAME, SOA_MODULE_INSTALL_CBN, false);
+ if (f != null) {
+ privateEP.setProperty(SOA_MODULE_INSTALL_DIR, f.getParentFile().getPath());
+ }
+
+ f = installedFileLocator.locate(
+ JAVA_MODULE_INSTALL_NAME, JAVA_MODULE_INSTALL_CBN, false);
+ if (f != null) {
+ privateEP.setProperty(JAVA_MODULE_INSTALL_DIR, f.getParentFile().getPath());
+ }
+
+ f = installedFileLocator.locate(
+ XML_MODULE_INSTALL_NAME, XML_MODULE_INSTALL_CBN, false);
+ if (f != null) {
+ privateEP.setProperty(XML_MODULE_INSTALL_DIR, f.getParentFile().getPath());
+ }
+
+ f = installedFileLocator.locate(
+ IDE_MODULE_INSTALL_NAME, IDE_MODULE_INSTALL_CBN, false);
+ if (f != null) {
+ privateEP.setProperty(IDE_MODULE_INSTALL_DIR, f.getParentFile().getPath());
+ }
+
+ f = installedFileLocator.locate(
+ ENTERPRISE_MODULE_INSTALL_NAME, ENTERPRISE_MODULE_INSTALL_CBN, false);
if (f != null) {
- privateEP.setProperty(MODULE_INSTALL_DIR, f.getParentFile().getPath());
+ privateEP.setProperty(ENTERPRISE_MODULE_INSTALL_DIR, f.getParentFile().getPath());
}
helper.putProperties(AntProjectHelper.PRIVATE_PROPERTIES_PATH, privateEP);
try {
ProjectManager.getDefault().saveProject(JbiProject.this);
Index: enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/resources/build-impl.xsl
===================================================================
RCS file: /cvs/enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/resources/Attic/build-impl.xsl,v
retrieving revision 1.17
diff -u -6 -r1.17 build-impl.xsl
--- enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/resources/build-impl.xsl 22 Oct 2007 13:19:50 -0000 1.17
+++ enterprise/compapp/projectjbi/src/org/netbeans/modules/compapp/projects/jbi/resources/build-impl.xsl 28 Feb 2008 15:13:58 -0000
@@ -168,44 +168,44 @@
Must set test.dir
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -645,36 +645,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+