diff --git a/java.j2seproject/copylibstask/src/org/netbeans/modules/java/j2seproject/copylibstask/CopyFiles.java b/java.j2seproject/copylibstask/src/org/netbeans/modules/java/j2seproject/copylibstask/CopyFiles.java
new file mode 100644
--- /dev/null
+++ b/java.j2seproject/copylibstask/src/org/netbeans/modules/java/j2seproject/copylibstask/CopyFiles.java
@@ -0,0 +1,106 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+
+package org.netbeans.modules.java.j2seproject.copylibstask;
+
+import java.io.File;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.PathTokenizer;
+import org.apache.tools.ant.Task;
+
+import org.apache.tools.ant.taskdefs.Copy;
+import org.apache.tools.ant.types.FileSet;
+
+/**
+ * Ant task that copies multiple files specified by one property (separated by ';').
+ * It merely delegates to copy task for every file in the files attribute.
+ * The files attribute is parsed as a Path structure.
+ *
+ * This is a workaround for http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18128.
+ *
+ * @author Pavel Buzek
+ */
+public class CopyFiles extends Task {
+
+ private File todir;
+ private String files;
+
+ public void execute() throws BuildException {
+ if (files == null) {
+ throw new BuildException ("files must be set.");
+ }
+ if (todir == null) {
+ throw new BuildException ("todir must be set.");
+ }
+ PathTokenizer tokenizer = new PathTokenizer (getFiles ());
+ while (tokenizer.hasMoreTokens ()) {
+ File f = getProject().resolveFile(tokenizer.nextToken());
+ Copy cp = (Copy) getProject ().createTask ("copy");
+ cp.setTodir (getToDir ());
+ if (f.isDirectory ()) {
+ FileSet fset = new FileSet ();
+ fset.setDir (f);
+ cp.addFileset (fset);
+ } else {
+ cp.setFile (f);
+ }
+ cp.execute ();
+ }
+ }
+
+ public String getFiles() {
+ return this.files;
+ }
+
+ public void setFiles (String files) {
+ assert files != null;
+ this.files = files;
+ }
+
+ public File getToDir() {
+ return this.todir;
+ }
+
+ public void setToDir (File todir) {
+ assert todir != null;
+ this.todir = todir;
+ }
+}
diff --git a/java.j2seproject/copylibstask/src/org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml b/java.j2seproject/copylibstask/src/org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml
--- a/java.j2seproject/copylibstask/src/org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml
+++ b/java.j2seproject/copylibstask/src/org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml
@@ -42,4 +42,5 @@
-->
+
diff --git a/web.project/antsrc/org/netbeans/modules/web/project/ant/CopyFiles.java b/web.project/antsrc/org/netbeans/modules/web/project/ant/CopyFiles.java
deleted file mode 100644
--- a/web.project/antsrc/org/netbeans/modules/web/project/ant/CopyFiles.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Sun in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-
-package org.netbeans.modules.web.project.ant;
-
-import java.io.File;
-import java.io.IOException;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.PathTokenizer;
-import org.apache.tools.ant.Task;
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Copy;
-import org.apache.tools.ant.types.FileSet;
-
-/**
- * Ant task that copies multiple files specified by one property (separated by ';').
- * It merely delegates to copy task for every file in the files attribute.
- * The files attribute is parsed as a Path structure.
- *
- * This is a workaround for http://nagoya.apache.org/bugzilla/show_bug.cgi?id=18128.
- *
- * @author Pavel Buzek
- */
-public class CopyFiles extends Task {
-
- private File todir;
- private String files;
-
- public void execute() throws BuildException {
-
- PathTokenizer tokenizer = new PathTokenizer (getFiles ());
- while (tokenizer.hasMoreTokens ()) {
- File f = getProject().resolveFile(tokenizer.nextToken());
- Copy cp = (Copy) getProject ().createTask ("copy");
- cp.setTodir (getToDir ());
- if (f.isDirectory ()) {
- FileSet fset = new FileSet ();
- fset.setDir (f);
- cp.addFileset (fset);
- } else {
- cp.setFile (f);
- }
- cp.execute ();
- }
- }
-
- public String getFiles() {
- return this.files;
- }
-
- public void setFiles (String files) {
- this.files = files;
- }
-
- public File getToDir() {
- return this.todir;
- }
-
- public void setToDir (File todir) {
- this.todir = todir;
- }
-}
diff --git a/web.project/build.xml b/web.project/build.xml
--- a/web.project/build.xml
+++ b/web.project/build.xml
@@ -56,7 +56,7 @@
-
+
diff --git a/web.project/nbproject/project.properties b/web.project/nbproject/project.properties
--- a/web.project/nbproject/project.properties
+++ b/web.project/nbproject/project.properties
@@ -46,7 +46,7 @@
../libs.commons_logging/external/commons-logging-1.1.jar
extra.module.files=\
- ant/extra/copyfiles.jar,\
+ ant/extra/jspcompile.jar,\
ant/sources/org/netbeans/modules/web/project/ant/*.java
javac.source=1.5
diff --git a/web.project/nbproject/project.xml b/web.project/nbproject/project.xml
--- a/web.project/nbproject/project.xml
+++ b/web.project/nbproject/project.xml
@@ -522,7 +522,7 @@
antsrc
${module.classpath}:${antsrc.cp.extra}
build/antclasses
- ${cluster}/ant/extra/copyfiles.jar
+ ${cluster}/ant/extra/jspcompile.jar
diff --git a/web.project/src/org/netbeans/modules/web/project/Bundle.properties b/web.project/src/org/netbeans/modules/web/project/Bundle.properties
--- a/web.project/src/org/netbeans/modules/web/project/Bundle.properties
+++ b/web.project/src/org/netbeans/modules/web/project/Bundle.properties
@@ -63,7 +63,7 @@
Open the project properties and in the Sources category browse the correct Web Pages folder.
MSG_WebXmlNotFound=web.xml file can not be found in {0}. It may have been removed or renamed.
-MSG_CopyFileMissing=Cannot find ide4/ant/extra/copyfiles.jar in the installation folder.
+MSG_JSPCompileFileMissing=Cannot find enterprise5/ant/extra/jspcompile.jar in the installation folder.
MSG_EjbRef=Web module contains local reference to an enterprise bean(s). To deploy, run or debug the web module it must be included in an enterprise application.
#Actions
diff --git a/web.project/src/org/netbeans/modules/web/project/WebProjectModule.java b/web.project/src/org/netbeans/modules/web/project/WebProjectModule.java
--- a/web.project/src/org/netbeans/modules/web/project/WebProjectModule.java
+++ b/web.project/src/org/netbeans/modules/web/project/WebProjectModule.java
@@ -67,7 +67,7 @@
*/
public class WebProjectModule extends ModuleInstall {
public static final String JSPC_CLASSPATH = "jspc.classpath"; //NOI18N
- public static final String COPYFILES_CLASSPATH = "copyfiles.classpath"; //NOI18N
+ public static final String JSPCTASK_CLASSPATH = "jspctask.classpath"; //NOI18N
public void restored() {
@@ -99,14 +99,14 @@
ep.setProperty(JSPC_CLASSPATH, jspc_cp);
changed = true;
}
- File copy_files = InstalledFileLocator.getDefault().locate("ant/extra/copyfiles.jar", null, false); //NOI18N
+ File copy_files = InstalledFileLocator.getDefault().locate("ant/extra/jspcompile.jar", null, false); //NOI18N
if (copy_files == null) {
- String msg = NbBundle.getMessage(WebProjectModule.class,"MSG_CopyFileMissing"); //NOI18N
+ String msg = NbBundle.getMessage(WebProjectModule.class,"MSG_JSPCompileFileMissing"); //NOI18N
DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(msg, NotifyDescriptor.ERROR_MESSAGE));
} else {
- String copy_files_old = ep.getProperty(COPYFILES_CLASSPATH);
+ String copy_files_old = ep.getProperty(JSPCTASK_CLASSPATH);
if (copy_files_old == null || !copy_files_old.equals(copy_files.toString())) {
- ep.setProperty(COPYFILES_CLASSPATH, copy_files.toString());
+ ep.setProperty(JSPCTASK_CLASSPATH, copy_files.toString());
changed = true;
}
}
diff --git a/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl b/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
--- a/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
+++ b/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl
@@ -964,7 +964,7 @@
-
+
-
+