org.netbeans.modules.project.libraries
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProject.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProject.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProject.java Tue Oct 14 16:36:43 2014 +0200
@@ -85,6 +85,11 @@
import org.netbeans.modules.web.clientproject.api.platform.PlatformProviders;
import org.netbeans.modules.web.clientproject.api.platform.PlatformProvidersListener;
import org.netbeans.modules.web.clientproject.bower.BowerProblemProvider;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectEvent;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectListener;
+import org.netbeans.modules.web.clientproject.indirect.PropertyEvaluator;
+import org.netbeans.modules.web.clientproject.indirect.ReferenceHelper;
import org.netbeans.modules.web.clientproject.node.NpmProblemProvider;
import org.netbeans.modules.web.clientproject.problems.ProjectPropertiesProblemProvider;
import org.netbeans.modules.web.clientproject.spi.platform.ClientProjectEnhancedBrowserImplementation;
@@ -103,14 +108,6 @@
import org.netbeans.modules.web.common.spi.ProjectWebRootProvider;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.support.LookupProviderSupport;
-import org.netbeans.spi.project.support.ant.AntBasedProjectRegistration;
-import org.netbeans.spi.project.support.ant.AntProjectEvent;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
-import org.netbeans.spi.project.support.ant.AntProjectListener;
-import org.netbeans.spi.project.support.ant.ProjectXmlSavedHook;
-import org.netbeans.spi.project.support.ant.PropertyEvaluator;
-import org.netbeans.spi.project.support.ant.PropertyUtils;
-import org.netbeans.spi.project.support.ant.ReferenceHelper;
import org.netbeans.spi.project.ui.PrivilegedTemplates;
import org.netbeans.spi.project.ui.ProjectOpenedHook;
import org.netbeans.spi.project.ui.RecommendedTemplates;
@@ -126,6 +123,7 @@
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileRenameEvent;
import org.openide.filesystems.FileUtil;
+import org.openide.util.EditableProperties;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.Mutex;
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProjectBrowserProvider.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProjectBrowserProvider.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProjectBrowserProvider.java Tue Oct 14 16:36:43 2014 +0200
@@ -48,14 +48,12 @@
import java.util.Collection;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.web.browser.api.WebBrowser;
-import org.netbeans.modules.web.browser.api.BrowserUISupport;
import org.netbeans.modules.web.browser.api.WebBrowsers;
import org.netbeans.modules.web.browser.spi.ProjectBrowserProvider;
import static org.netbeans.modules.web.browser.spi.ProjectBrowserProvider.PROP_BROWSER_ACTIVE;
-import org.netbeans.modules.web.clientproject.ui.customizer.CompositePanelProviderImpl;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
import org.netbeans.modules.web.clientproject.ui.customizer.CustomizerProviderImpl;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
-import org.netbeans.spi.project.support.ant.EditableProperties;
+import org.openide.util.EditableProperties;
import org.openide.util.Exceptions;
/**
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProjectSources.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProjectSources.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProjectSources.java Tue Oct 14 16:36:43 2014 +0200
@@ -48,9 +48,9 @@
import org.netbeans.api.project.SourceGroup;
import org.netbeans.api.project.Sources;
import org.netbeans.modules.web.clientproject.api.WebClientProjectConstants;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
-import org.netbeans.spi.project.support.ant.PropertyEvaluator;
-import org.netbeans.spi.project.support.ant.SourcesHelper;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
+import org.netbeans.modules.web.clientproject.indirect.PropertyEvaluator;
+import org.netbeans.modules.web.clientproject.indirect.SourcesHelper;
import org.openide.util.ChangeSupport;
/**
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/FileEncodingQueryImpl.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/FileEncodingQueryImpl.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/FileEncodingQueryImpl.java Tue Oct 14 16:36:43 2014 +0200
@@ -49,8 +49,8 @@
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;
import java.nio.charset.UnsupportedCharsetException;
+import org.netbeans.modules.web.clientproject.indirect.PropertyEvaluator;
import org.netbeans.spi.queries.FileEncodingQueryImplementation;
-import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.openide.filesystems.FileObject;
import org.openide.util.Parameters;
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/SharabilityQueryImpl.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/SharabilityQueryImpl.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/SharabilityQueryImpl.java Tue Oct 14 16:36:43 2014 +0200
@@ -51,8 +51,8 @@
import java.util.concurrent.CopyOnWriteArraySet;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.queries.SharabilityQuery.Sharability;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
-import org.netbeans.spi.project.support.ant.PropertyEvaluator;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
+import org.netbeans.modules.web.clientproject.indirect.PropertyEvaluator;
import org.netbeans.spi.queries.SharabilityQueryImplementation2;
import org.openide.util.Mutex;
import org.openide.util.WeakListeners;
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/TemplateAttributesProviderImpl.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/TemplateAttributesProviderImpl.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/TemplateAttributesProviderImpl.java Tue Oct 14 16:36:43 2014 +0200
@@ -51,13 +51,13 @@
import org.netbeans.api.project.ProjectInformation;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ProjectUtils;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
-import org.netbeans.spi.project.support.ant.EditableProperties;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
import org.netbeans.spi.queries.FileEncodingQueryImplementation;
import org.openide.filesystems.FileUtil;
import org.openide.loaders.CreateFromTemplateAttributesProvider;
import org.openide.loaders.DataFolder;
import org.openide.loaders.DataObject;
+import org.openide.util.EditableProperties;
import org.openide.util.Utilities;
/**
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/browser/ClientProjectEnhancedBrowserImpl.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/ClientProjectEnhancedBrowserImpl.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/ClientProjectEnhancedBrowserImpl.java Tue Oct 14 16:36:43 2014 +0200
@@ -48,13 +48,13 @@
import org.netbeans.modules.web.browser.api.WebBrowser;
import org.netbeans.modules.web.clientproject.ClientSideProject;
import org.netbeans.modules.web.clientproject.ClientSideProjectConstants;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
import org.netbeans.modules.web.clientproject.spi.platform.ClientProjectEnhancedBrowserImplementation;
import org.netbeans.modules.web.clientproject.spi.platform.ProjectConfigurationCustomizer;
import org.netbeans.modules.web.clientproject.spi.platform.RefreshOnSaveListener;
import org.netbeans.modules.web.clientproject.ui.browser.BrowserConfigurationPanel;
import org.netbeans.spi.project.ActionProvider;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
-import org.netbeans.spi.project.support.ant.EditableProperties;
+import org.openide.util.EditableProperties;
public class ClientProjectEnhancedBrowserImpl implements ClientProjectEnhancedBrowserImplementation {
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/createprojectapi/ClientSideProjectGenerator.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/createprojectapi/ClientSideProjectGenerator.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/createprojectapi/ClientSideProjectGenerator.java Tue Oct 14 16:36:43 2014 +0200
@@ -46,8 +46,8 @@
import org.netbeans.api.project.FileOwnerQuery;
import org.netbeans.api.project.Project;
import org.netbeans.modules.web.clientproject.ClientSideProject;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.openide.util.Parameters;
/**
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/grunt/GruntCustomizerPanel.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/grunt/GruntCustomizerPanel.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/grunt/GruntCustomizerPanel.java Tue Oct 14 16:36:43 2014 +0200
@@ -48,10 +48,10 @@
import java.util.prefs.Preferences;
import org.openide.util.NbPreferences;
import org.netbeans.modules.web.clientproject.ClientSideProject;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
-import org.netbeans.spi.project.support.ant.EditableProperties;
-import org.netbeans.spi.project.support.ant.PropertyEvaluator;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
+import org.netbeans.modules.web.clientproject.indirect.PropertyEvaluator;
import org.netbeans.spi.project.ui.support.ProjectCustomizer;
+import org.openide.util.EditableProperties;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/indirect/AntProjectEvent.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/indirect/AntProjectEvent.java Tue Oct 14 16:36:43 2014 +0200
@@ -0,0 +1,50 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle 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]"
+ *
+ * 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.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2014 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.web.clientproject.indirect;
+
+/**
+ *
+ * @author jtulach
+ */
+public class AntProjectEvent {
+
+}
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/indirect/AntProjectHelper.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/indirect/AntProjectHelper.java Tue Oct 14 16:36:43 2014 +0200
@@ -0,0 +1,109 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle 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]"
+ *
+ * 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.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2014 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.web.clientproject.indirect;
+
+import java.io.File;
+import org.netbeans.spi.project.AuxiliaryConfiguration;
+import org.netbeans.spi.queries.SharabilityQueryImplementation2;
+import org.openide.filesystems.FileObject;
+import org.openide.util.EditableProperties;
+import org.w3c.dom.Element;
+
+/**
+ */
+public class AntProjectHelper {
+ public static Object PRIVATE_PROPERTIES_PATH = new Object();
+ public static Object PROJECT_PROPERTIES_PATH = new Object();
+
+ public EditableProperties getProperties(Object PRIVATE_PROPERTIES_PATH) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public void putProperties(Object PRIVATE_PROPERTIES_PATH, EditableProperties privateProps) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public SharabilityQueryImplementation2 createSharabilityQuery2(PropertyEvaluator evaluator, String[] toArray, String[] string) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public PropertyEvaluator getStandardPropertyEvaluator() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public File resolveFile(String licensePath) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public FileObject getProjectDirectory() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public FileObject resolveFileObject(String sourceFolder) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public void notifyDeleted() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public AuxiliaryConfiguration createAuxiliaryConfiguration() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public void addAntProjectListener(AntProjectListener l) {
+ }
+ public void removeAntProjectListener(AntProjectListener l) {
+ }
+
+ public Element getPrimaryConfigurationData(boolean b) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public Object createCacheDirectoryProvider() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public Object createAuxiliaryProperties() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+}
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/indirect/AntProjectListener.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/indirect/AntProjectListener.java Tue Oct 14 16:36:43 2014 +0200
@@ -0,0 +1,51 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle 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]"
+ *
+ * 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.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2014 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.web.clientproject.indirect;
+
+import java.util.EventListener;
+
+/**
+ */
+public interface AntProjectListener extends EventListener {
+ public void configurationXmlChanged(AntProjectEvent ev);
+ public void propertiesChanged(AntProjectEvent ev);
+}
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/indirect/PropertyEvaluator.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/indirect/PropertyEvaluator.java Tue Oct 14 16:36:43 2014 +0200
@@ -0,0 +1,108 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle 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.clientproject.indirect;
+
+import java.beans.PropertyChangeListener;
+import java.util.Map;
+import org.netbeans.api.annotations.common.CheckForNull;
+import org.netbeans.api.annotations.common.NonNull;
+
+/**
+ * A way of mapping property names to values.
+ *
+ * This interface defines no independent thread safety, but in typical usage
+ * it will be used with the project manager mutex. Changes should be fired
+ * synchronously.
+ * @author Jesse Glick
+ * @see PropertyUtils#sequentialPropertyEvaluator
+ * @see AntProjectHelper#getStandardPropertyEvaluator
+ */
+public interface PropertyEvaluator {
+
+ /**
+ * Evaluate a single property.
+ * @param prop the name of a property
+ * @return its value, or null if it is not defined or its value could not be
+ * retrieved for some reason (e.g. a circular definition)
+ */
+ @CheckForNull String getProperty(@NonNull String prop);
+
+ /**
+ * Evaluate a block of text possibly containing property references.
+ * The syntax is the same as for Ant: ${foo} means the value
+ * of the property foo; $$ is an escape for
+ * $; references to undefined properties are left unsubstituted.
+ * @param text some text possibly containing one or more property references
+ * @return its value, or null if some problem (such a circular definition) made
+ * it impossible to retrieve the values of some properties
+ */
+ @CheckForNull String evaluate(@NonNull String text);
+
+ /**
+ * Get a set of all current property definitions at once.
+ * This may be more efficient than evaluating individual properties,
+ * depending on the implementation.
+ * @return an immutable map from property names to values, or null if the
+ * mapping could not be computed (e.g. due to a circular definition)
+ */
+ @CheckForNull Map getProperties();
+
+ /**
+ * Add a listener to changes in particular property values.
+ * As generally true with property change listeners, the old and new
+ * values may both be null in case the true values are not known or not
+ * easily computed; and the property name might be null to signal that any
+ * property might have changed.
+ * @param listener a listener to add
+ */
+ void addPropertyChangeListener(PropertyChangeListener listener);
+
+ /**
+ * Remove a listener to changes in particular property values.
+ * @param listener a listener to remove
+ */
+ void removePropertyChangeListener(PropertyChangeListener listener);
+
+}
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/indirect/ReferenceHelper.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/indirect/ReferenceHelper.java Tue Oct 14 16:36:43 2014 +0200
@@ -0,0 +1,65 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle 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]"
+ *
+ * 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.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2014 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.web.clientproject.indirect;
+
+import java.io.File;
+import org.netbeans.spi.project.AuxiliaryConfiguration;
+
+/**
+ *
+ * @author jtulach
+ */
+public class ReferenceHelper {
+
+ public ReferenceHelper(AntProjectHelper helper, AuxiliaryConfiguration configuration, PropertyEvaluator eval) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public void fixReferences(File originalPath) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public String createForeignFileReference(File file, Object object) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+}
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/indirect/SourcesHelper.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/indirect/SourcesHelper.java Tue Oct 14 16:36:43 2014 +0200
@@ -0,0 +1,81 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle 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]"
+ *
+ * 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.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2014 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.web.clientproject.indirect;
+
+import org.netbeans.api.project.Sources;
+import org.netbeans.modules.web.clientproject.ClientSideProject;
+
+/**
+ *
+ * @author jtulach
+ */
+public class SourcesHelper {
+
+ public SourcesHelper(ClientSideProject project, AntProjectHelper helper, PropertyEvaluator evaluator) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public SourcesHelper sourceRoot(String string) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public SourcesHelper displayName(String message) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public SourcesHelper add() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public SourcesHelper type(String SOURCES_TYPE_HTML5) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public void registerExternalRoots(int EXTERNAL_ALGORITHM_TRANSIENT) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ public Sources createSources() {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+}
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/problems/ProjectPropertiesProblemProvider.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/problems/ProjectPropertiesProblemProvider.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/problems/ProjectPropertiesProblemProvider.java Tue Oct 14 16:36:43 2014 +0200
@@ -51,8 +51,8 @@
import java.util.concurrent.CopyOnWriteArrayList;
import org.netbeans.modules.web.clientproject.ClientSideProject;
import org.netbeans.modules.web.clientproject.ClientSideProjectConstants;
+import org.netbeans.modules.web.clientproject.indirect.PropertyEvaluator;
import org.netbeans.modules.web.clientproject.ui.customizer.CompositePanelProviderImpl;
-import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.netbeans.spi.project.ui.ProjectProblemsProvider;
import org.netbeans.spi.project.ui.support.ProjectProblemsProviderSupport;
import org.openide.filesystems.FileAttributeEvent;
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/sites/SiteZip.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/sites/SiteZip.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/sites/SiteZip.java Tue Oct 14 16:36:43 2014 +0200
@@ -62,9 +62,9 @@
import org.netbeans.modules.web.clientproject.util.FileUtilities;
import org.netbeans.modules.web.clientproject.util.FileUtilities.ZipEntryFilter;
import org.netbeans.modules.web.clientproject.util.FileUtilities.ZipEntryTask;
-import org.netbeans.spi.project.support.ant.EditableProperties;
import org.openide.filesystems.FileObject;
import org.openide.util.ChangeSupport;
+import org.openide.util.EditableProperties;
import org.openide.util.NbBundle;
import org.openide.util.NbPreferences;
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/ui/ClientSideProjectLogicalView.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/ClientSideProjectLogicalView.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/ClientSideProjectLogicalView.java Tue Oct 14 16:36:43 2014 +0200
@@ -74,10 +74,10 @@
import org.netbeans.modules.web.clientproject.api.jstesting.JsTestingProviders;
import org.netbeans.modules.web.clientproject.api.platform.PlatformProvider;
import org.netbeans.modules.web.clientproject.api.remotefiles.RemoteFilesNodeFactory;
+import org.netbeans.modules.web.clientproject.indirect.PropertyEvaluator;
import org.netbeans.modules.web.clientproject.spi.platform.ClientProjectEnhancedBrowserImplementation;
import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;
import org.netbeans.spi.project.ActionProvider;
-import org.netbeans.spi.project.support.ant.PropertyEvaluator;
import org.netbeans.spi.project.ui.LogicalViewProvider;
import org.netbeans.spi.project.ui.ProjectProblemsProvider;
import org.netbeans.spi.project.ui.support.CommonProjectActions;
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/ui/customizer/ClientSideProjectProperties.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/customizer/ClientSideProjectProperties.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/customizer/ClientSideProjectProperties.java Tue Oct 14 16:36:43 2014 +0200
@@ -59,11 +59,11 @@
import org.netbeans.modules.web.clientproject.api.jslibs.JavaScriptLibrarySelectionPanel.SelectedLibrary;
import org.netbeans.modules.web.clientproject.api.platform.PlatformProvider;
import org.netbeans.modules.web.clientproject.api.platform.PlatformProviders;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
import org.netbeans.modules.web.clientproject.spi.platform.ClientProjectEnhancedBrowserImplementation;
import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
-import org.netbeans.spi.project.support.ant.EditableProperties;
import org.openide.filesystems.FileUtil;
+import org.openide.util.EditableProperties;
import org.openide.util.Mutex;
import org.openide.util.MutexException;
import org.openide.util.NbBundle;
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/ui/customizer/LicensePanelSupport.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/customizer/LicensePanelSupport.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/customizer/LicensePanelSupport.java Tue Oct 14 16:36:43 2014 +0200
@@ -47,12 +47,12 @@
import java.io.OutputStream;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
-import org.netbeans.spi.project.support.ant.EditableProperties;
-import org.netbeans.spi.project.support.ant.PropertyEvaluator;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
+import org.netbeans.modules.web.clientproject.indirect.PropertyEvaluator;
import org.netbeans.spi.project.support.ant.ui.CustomizerUtilities;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
+import org.openide.util.EditableProperties;
// copied from web.common
public final class LicensePanelSupport implements CustomizerUtilities.LicensePanelContentHandler {
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/ui/wizard/ClientSideProjectWizardIterator.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/wizard/ClientSideProjectWizardIterator.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/wizard/ClientSideProjectWizardIterator.java Tue Oct 14 16:36:43 2014 +0200
@@ -66,12 +66,12 @@
import org.netbeans.modules.web.clientproject.ClientSideProject;
import org.netbeans.modules.web.clientproject.ClientSideProjectConstants;
import org.netbeans.modules.web.clientproject.api.jslibs.JavaScriptLibraries;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
import org.netbeans.modules.web.clientproject.spi.ClientProjectExtender;
import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation;
import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation.ProjectProperties;
import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;
import org.netbeans.modules.web.clientproject.util.FileUtilities;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.ui.support.ProjectChooser;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/ui/wizard/CreateSiteTemplate.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/wizard/CreateSiteTemplate.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/ui/wizard/CreateSiteTemplate.java Tue Oct 14 16:36:43 2014 +0200
@@ -69,7 +69,6 @@
import org.netbeans.modules.web.clientproject.sites.SiteZip;
import org.netbeans.modules.web.clientproject.ui.customizer.ClientSideProjectProperties;
import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;
-import org.netbeans.spi.project.support.ant.EditableProperties;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.WizardDescriptor;
@@ -86,6 +85,7 @@
import org.openide.nodes.FilterNode;
import org.openide.nodes.Node;
import org.openide.util.ChangeSupport;
+import org.openide.util.EditableProperties;
import org.openide.util.Exceptions;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
diff -r e7499d50abe0 web.clientproject/src/org/netbeans/modules/web/clientproject/util/ClientSideProjectUtilities.java
--- a/web.clientproject/src/org/netbeans/modules/web/clientproject/util/ClientSideProjectUtilities.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/src/org/netbeans/modules/web/clientproject/util/ClientSideProjectUtilities.java Tue Oct 14 16:36:43 2014 +0200
@@ -69,10 +69,8 @@
import org.netbeans.modules.web.clientproject.api.jstesting.JsTestingProviders;
import org.netbeans.modules.web.clientproject.api.platform.PlatformProvider;
import org.netbeans.modules.web.clientproject.api.platform.PlatformProviders;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
import org.netbeans.modules.web.clientproject.ui.customizer.ClientSideProjectProperties;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
-import org.netbeans.spi.project.support.ant.ProjectGenerator;
-import org.netbeans.spi.project.support.ant.PropertyUtils;
import org.netbeans.spi.project.ui.ProjectProblemsProvider;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
diff -r e7499d50abe0 web.clientproject/test/unit/src/org/netbeans/modules/web/clientproject/ClientSideProjectTest.java
--- a/web.clientproject/test/unit/src/org/netbeans/modules/web/clientproject/ClientSideProjectTest.java Tue Oct 14 15:26:47 2014 +0200
+++ b/web.clientproject/test/unit/src/org/netbeans/modules/web/clientproject/ClientSideProjectTest.java Tue Oct 14 16:36:43 2014 +0200
@@ -53,13 +53,13 @@
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.web.browser.api.BrowserFamilyId;
import org.netbeans.modules.web.browser.spi.EnhancedBrowserFactory;
+import org.netbeans.modules.web.clientproject.indirect.AntProjectHelper;
import org.netbeans.modules.web.clientproject.sites.SiteZip;
import org.netbeans.modules.web.clientproject.sites.SiteZipPanel;
import org.netbeans.modules.web.clientproject.spi.SiteTemplateImplementation;
import org.netbeans.modules.web.clientproject.ui.customizer.ClientSideProjectProperties;
import org.netbeans.modules.web.clientproject.util.ClientSideProjectUtilities;
import org.netbeans.spi.project.ProjectServiceProvider;
-import org.netbeans.spi.project.support.ant.AntProjectHelper;
import org.netbeans.spi.project.ui.ProjectProblemsProvider;
import org.openide.awt.HtmlBrowser;
import org.openide.filesystems.FileObject;