# HG changeset patch # User Jesse Glick # Date 1300913427 14400 # Node ID c85dcf71e4243c978b3fd9358bdb766489492843 # Parent bbc8dd036333aaaa7d37d9449f856a14427e0599 Tests at least should compile now. diff -r bbc8dd036333 -r c85dcf71e424 visualweb.insync/nbproject/genfiles.properties --- a/visualweb.insync/nbproject/genfiles.properties Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.insync/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400 @@ -1,5 +1,5 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=4767b086 +nbproject/build-impl.xml.data.CRC32=2f4d3ee1 nbproject/build-impl.xml.script.CRC32=578bda41 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45 diff -r bbc8dd036333 -r c85dcf71e424 visualweb.insync/nbproject/project.xml --- a/visualweb.insync/nbproject/project.xml Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.insync/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400 @@ -489,6 +489,10 @@ unit + org.netbeans.libs.junit4 + + +

org.netbeans.modules.editor.mimelookup.impl

@@ -503,6 +507,11 @@

+ org.netbeans.modules.nbjunit + + + +

org.netbeans.modules.projectapi

diff -r bbc8dd036333 -r c85dcf71e424 visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/InsyncTestBase.java --- a/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/InsyncTestBase.java Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.insync/test/unit/src/org/netbeans/modules/visualweb/insync/InsyncTestBase.java Wed Mar 23 16:50:27 2011 -0400 @@ -40,10 +40,9 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; -import junit.framework.*; import org.netbeans.api.project.Project; import org.netbeans.api.project.libraries.LibraryManager; -import org.netbeans.core.startup.layers.NbinstURLStreamHandlerFactory; +import org.netbeans.junit.MockServices; import org.netbeans.junit.NbTestCase; import org.netbeans.modules.visualweb.insync.beans.Bean; import org.netbeans.modules.visualweb.insync.beans.BeansUnit; @@ -52,7 +51,7 @@ import org.netbeans.modules.web.project.WebProject; import org.openide.filesystems.FileObject; import org.openide.util.Exceptions; -import org.openide.util.test.MockLookup; +import org.openide.util.Lookup; /** * @@ -283,12 +282,7 @@ } private static void setupServices() { - URLStreamHandlerFactory urlStreamHandlerFactory = new NbinstURLStreamHandlerFactory(); - URL.setURLStreamHandlerFactory(urlStreamHandlerFactory); - MockLookup.setInstances( - new RepositoryImpl(), - new InsyncMimeResolver(), - urlStreamHandlerFactory - ); + URL.setURLStreamHandlerFactory(Lookup.getDefault().lookup(URLStreamHandlerFactory.class)); + MockServices.setServices(RepositoryImpl.class, InsyncMimeResolver.class); } } diff -r bbc8dd036333 -r c85dcf71e424 visualweb.jsfsupport/nbproject/genfiles.properties --- a/visualweb.jsfsupport/nbproject/genfiles.properties Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.jsfsupport/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400 @@ -1,5 +1,5 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=eabbf6c6 +nbproject/build-impl.xml.data.CRC32=269417f7 nbproject/build-impl.xml.script.CRC32=c51984ed nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45 diff -r bbc8dd036333 -r c85dcf71e424 visualweb.jsfsupport/nbproject/project.xml --- a/visualweb.jsfsupport/nbproject/project.xml Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.jsfsupport/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400 @@ -158,11 +158,6 @@

- - org.openide.util - - -

diff -r bbc8dd036333 -r c85dcf71e424 visualweb.propertyeditors/nbproject/genfiles.properties --- a/visualweb.propertyeditors/nbproject/genfiles.properties Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.propertyeditors/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400 @@ -1,5 +1,5 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=21855a35 +nbproject/build-impl.xml.data.CRC32=2a3c6743 nbproject/build-impl.xml.script.CRC32=2101cfd6 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45 diff -r bbc8dd036333 -r c85dcf71e424 visualweb.propertyeditors/nbproject/project.xml --- a/visualweb.propertyeditors/nbproject/project.xml Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.propertyeditors/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400 @@ -210,6 +210,20 @@ + + + unit + + org.netbeans.libs.junit4 + + + + org.netbeans.modules.nbjunit + + + + +

org.netbeans.modules.visualweb.designer.jsf org.netbeans.modules.visualweb.insync diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/nbproject/genfiles.properties --- a/visualweb.websvcmgr/nbproject/genfiles.properties Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.websvcmgr/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400 @@ -1,5 +1,5 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=1aa34677 +nbproject/build-impl.xml.data.CRC32=87240cfe nbproject/build-impl.xml.script.CRC32=c13b62a3 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45 diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/nbproject/project.properties --- a/visualweb.websvcmgr/nbproject/project.properties Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.websvcmgr/nbproject/project.properties Wed Mar 23 16:50:27 2011 -0400 @@ -41,7 +41,3 @@ # made subject to such option by the copyright holder. javac.source=1.6 -test-unit-sys-prop.java.endorsed.dirs=${websvc.jaxws21.dir}/modules/ext/jaxws21/api -test.qa-functional.cp.extra=${nb_all}/visualweb.kit/gravy/builds/gravy.jar:\ -${visualweb.websvcmgr.dir}/modules/ext/tidy-mod.jar:\ -${nb_all}/testtools/external/httpunit.jar diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/nbproject/project.xml --- a/visualweb.websvcmgr/nbproject/project.xml Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.websvcmgr/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400 @@ -354,20 +354,7 @@ unit - org.netbeans.modules.websvc.manager - - - - - org.netbeans.modules.websvc.saas.api - - - - - - qa-functional - - org.netbeans.modules.visualweb.insync + org.netbeans.libs.junit4

@@ -375,12 +362,20 @@

+ + + qa-functional

- org.netbeans.modules.visualweb.gravy + org.netbeans.libs.junit4

- org.netbeans.modules.jellytools.platform + org.netbeans.modules.visualweb.gravy + + + + + org.netbeans.modules.visualweb.insync

diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/test/qa-functional/src/org/netbeans/test/websvcmgr/WebServiceAcceptanceTest.java --- a/visualweb.websvcmgr/test/qa-functional/src/org/netbeans/test/websvcmgr/WebServiceAcceptanceTest.java Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.websvcmgr/test/qa-functional/src/org/netbeans/test/websvcmgr/WebServiceAcceptanceTest.java Wed Mar 23 16:50:27 2011 -0400 @@ -51,13 +51,9 @@ import org.netbeans.modules.visualweb.gravy.dataconnectivity.ServerNavigatorOperator; import org.netbeans.modules.visualweb.gravy.dataconnectivity.ServerExplorerOperator; import org.netbeans.modules.visualweb.gravy.designer.DesignerPaneOperator; -import org.netbeans.modules.visualweb.gravy.DocumentOutlineOperator; import org.netbeans.modules.visualweb.gravy.plugins.PluginsOperator; import org.netbeans.modules.visualweb.gravy.actions.FindAction; import org.netbeans.modules.visualweb.gravy.websvc.*; -import org.netbeans.modules.visualweb.gravy.RaveWindowOperator; -import org.netbeans.modules.visualweb.gravy.TestUtils; -import org.netbeans.modules.visualweb.gravy.Util; import org.netbeans.modules.visualweb.gravy.model.project.components.*; import org.netbeans.modules.visualweb.gravy.model.project.*; import org.netbeans.modules.visualweb.gravy.model.components.*; @@ -65,7 +61,6 @@ import org.netbeans.modules.visualweb.gravy.model.*; import org.netbeans.modules.visualweb.gravy.*; -import com.meterware.httpunit.*; import java.util.Properties; import java.awt.event.KeyEvent; import java.awt.Point; @@ -304,6 +299,7 @@ } private void verifyHTTP(Project prj, String verificationString) { + /* XXX httpunit not available anywhere try { WebConversation conversation = new WebConversation(); WebResponse response = null; @@ -315,6 +311,7 @@ e.printStackTrace(); fail("Excetion in HTTP check : " + e); } + */ } private void projectUndeployAndClose(Project prj) { diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/manager/test/DialogDisplayerNotifier.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/manager/test/DialogDisplayerNotifier.java Wed Mar 23 16:50:27 2011 -0400 @@ -0,0 +1,72 @@ +/* + * 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): + * + * Portions Copyrighted 2007 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.websvc.manager.test; + +import java.awt.Dialog; +import java.util.LinkedList; +import org.openide.DialogDescriptor; +import org.openide.DialogDisplayer; +import org.openide.NotifyDescriptor; + +/** + * + * @author quynguyen + */ +public class DialogDisplayerNotifier extends DialogDisplayer { + private LinkedList listeners = new LinkedList(); + + public void addListener(WebServiceManagerListener listener) { + listeners.add(listener); + } + + public void removeListener(WebServiceManagerListener listener) { + listeners.remove(listener); + } + + public void removeAllListeners() { + listeners.clear(); + } + + @Override + public Object notify(NotifyDescriptor descriptor) { + for (WebServiceManagerListener listener : listeners) { + listener.eventFired(new WebServiceManagerEvent((String)descriptor.getMessage())); + } + return NotifyDescriptor.OK_OPTION; + } + + @Override + public Dialog createDialog(DialogDescriptor descriptor) { + return null; + } + +} diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/manager/test/InstalledFileLocatorImpl.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/manager/test/InstalledFileLocatorImpl.java Wed Mar 23 16:50:27 2011 -0400 @@ -0,0 +1,89 @@ +/* + * 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): + * + * Portions Copyrighted 2007 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.websvc.manager.test; + +import java.io.File; +import java.util.ArrayList; +import org.openide.modules.InstalledFileLocator; + +/** + * InstalledFileLocator implementation that searches the NB install directory + * (uses java.endorsed.dirs value from nbproject/project.properties) + * @author quynguyen + */ +public class InstalledFileLocatorImpl extends InstalledFileLocator { + + private ArrayList baseDirs; + private File userDirConfigRoot; + + public InstalledFileLocatorImpl() { + super(); + File endorsedDir = new File(System.getProperty("java.endorsed.dirs")); + for (int i = 0; i < 5; i++) { + endorsedDir = endorsedDir.getParentFile(); + } + + File installRoot = endorsedDir; + File[] subdirs = installRoot.listFiles(); + baseDirs = new ArrayList(); + + for (int i = 0; subdirs != null && i < subdirs.length; i++) { + if (subdirs[i].isDirectory()) { + baseDirs.add(subdirs[i]); + } + } + } + + @Override + public File locate(String relativePath, String codeNameBase, boolean localized) { + for (File baseDir : baseDirs) { + File f = new File(baseDir, relativePath); + if (f.exists()) { + return f; + } + } + + return null; + } + + public void setUserConfigRoot(File baseDir) { + if (userDirConfigRoot != null) { + baseDirs.remove(userDirConfigRoot); + userDirConfigRoot = null; + } + + if (baseDir != null) { + baseDirs.add(baseDir); + userDirConfigRoot = baseDir; + } + } +} diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/manager/test/SetupData.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/manager/test/SetupData.java Wed Mar 23 16:50:27 2011 -0400 @@ -0,0 +1,83 @@ +/* + * 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): + * + * Portions Copyrighted 2007 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.websvc.manager.test; + +import java.io.File; + +/** + * + * @author quynguyen + */ +public class SetupData { + private File localWsdlFile = null; + private File localCatalogFile = null; + private File localOriginalWsdl = null; + + private File websvcHome = null; + + public SetupData() { + } + + public File getLocalCatalogFile() { + return localCatalogFile; + } + + public void setLocalCatalogFile(File localCatalogFile) { + this.localCatalogFile = localCatalogFile; + } + + public File getLocalOriginalWsdl() { + return localOriginalWsdl; + } + + public void setLocalOriginalWsdl(File localOriginalWsdl) { + this.localOriginalWsdl = localOriginalWsdl; + } + + public File getLocalWsdlFile() { + return localWsdlFile; + } + + public void setLocalWsdlFile(File localWsdlFile) { + this.localWsdlFile = localWsdlFile; + } + + public File getWebsvcHome() { + return websvcHome; + } + + public void setWebsvcHome(File websvcHome) { + this.websvcHome = websvcHome; + } + + +} diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/manager/test/SetupUtil.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/manager/test/SetupUtil.java Wed Mar 23 16:50:27 2011 -0400 @@ -0,0 +1,265 @@ +/* + * 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): + * + * Portions Copyrighted 2007 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.websvc.manager.test; + +import java.io.File; +import java.io.FileFilter; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.nio.channels.FileChannel; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import java.util.jar.Manifest; +import org.netbeans.junit.MockServices; +import org.netbeans.modules.websvc.manager.WebServiceManager; +import org.openide.DialogDisplayer; +import org.openide.filesystems.FileSystem; +import org.openide.filesystems.FileUtil; +import org.openide.filesystems.LocalFileSystem; +import org.openide.filesystems.MultiFileSystem; +import org.openide.filesystems.Repository; +import org.openide.filesystems.XMLFileSystem; +import org.openide.modules.InstalledFileLocator; +import org.openide.util.Lookup; +import org.openide.util.LookupEvent; +import org.openide.util.LookupListener; +import org.openide.util.NbCollections; + +/** + * + * @author quynguyen + */ +public class SetupUtil { + private static final String WORKDIR_SPACES = "user directory"; + private static final String WORKDIR = "userdirectory"; + private static final String TEST_WSDL = "/org/netbeans/modules/websvc/manager/resources/uszip-asmx-catalog/www.webservicemart.com/uszip.asmx.wsdl"; + private static final String TEST_CATALOG = "/org/netbeans/modules/websvc/manager/resources/uszip-asmx-catalog/catalog.xml"; + private static final String CATALOG_FILE = "uszip-asmx-catalog/catalog.xml"; + private static final String WSDL_FILE = "uszip-asmx-catalog/www.webservicemart.com/uszip.asmx.wsdl"; + + private static final String ENDORSED_REF = "modules/ext/jaxws21/api/jaxws-api.jar"; + private static final String JAXWS_LIB_PROPERTY = "libs.jaxws21.classpath"; + + public static SetupData commonSetUp(File workingDir) throws Exception { + SetupData data = new SetupData(); + + File userDir = new File(workingDir.getParentFile(), + System.getProperty("os.name").startsWith("Windows") ? WORKDIR_SPACES : WORKDIR); + System.getProperties().setProperty("netbeans.user", userDir.getAbsolutePath()); + + File websvcHome = new File(WebServiceManager.WEBSVC_HOME); + data.setWebsvcHome(websvcHome); + + File websvcUserDir = new File(WebServiceManager.WEBSVC_HOME); + websvcUserDir.mkdirs(); + + File wsdlFile = new File(websvcUserDir, WSDL_FILE); + File catalogFile = new File(websvcUserDir, CATALOG_FILE); + + retrieveURL(wsdlFile, SetupUtil.class.getResource(TEST_WSDL)); + retrieveURL(catalogFile, SetupUtil.class.getResource(TEST_CATALOG)); + + copy(wsdlFile, workingDir); + + data.setLocalWsdlFile(wsdlFile); + data.setLocalCatalogFile(catalogFile); + data.setLocalOriginalWsdl(new File(workingDir, wsdlFile.getName())); + + MainFS fs = new MainFS(); + fs.setConfigRootDir(websvcHome.getParentFile()); + TestRepository.defaultFileSystem = fs; + + MockServices.setServices(DialogDisplayerNotifier.class, InstalledFileLocatorImpl.class, TestRepository.class); + + InstalledFileLocatorImpl locator = (InstalledFileLocatorImpl)Lookup.getDefault().lookup(InstalledFileLocator.class); + locator.setUserConfigRoot(websvcHome.getParentFile()); + + File targetBuildProperties = new File(websvcUserDir.getParentFile().getParentFile(), "build.properties"); + generatePropertiesFile(targetBuildProperties); + + return data; + } + + public static void commonTearDown() throws Exception { + DialogDisplayer dd = DialogDisplayer.getDefault(); + if (dd instanceof DialogDisplayerNotifier) { + ((DialogDisplayerNotifier)dd).removeAllListeners(); + } + + MockServices.setServices(); + } + + public static void copy(File src, File target) throws Exception { + if (src.isFile()) { + File targetFile = new File(target, src.getName()); + + FileInputStream is = new FileInputStream(src); + FileOutputStream os = new FileOutputStream(targetFile); + + FileChannel inputChannel = is.getChannel(); + FileChannel outputChannel = os.getChannel(); + + inputChannel.transferTo(0, inputChannel.size(), outputChannel); + inputChannel.close(); + outputChannel.close(); + }else { + File newDir = new File(target, src.getName()); + newDir.mkdirs(); + + File[] dirFiles = src.listFiles(); + if (dirFiles != null) { + for (int i = 0; i < dirFiles.length; i++) { + copy(dirFiles[i], newDir); + } + } + } + } + + public static void retrieveURL(File targetFile, URL url) throws IOException { + targetFile.getParentFile().mkdirs(); + FileOutputStream fos = new FileOutputStream(targetFile); + byte[] readBuffer = new byte[1024]; + + InputStream is = url.openStream(); + int bytesRead = 0; + while ( (bytesRead = is.read(readBuffer, 0, 1024)) > 0) { + fos.write(readBuffer, 0, bytesRead); + } + fos.flush(); + fos.close(); + is.close(); + } + + private static void generatePropertiesFile(File target) throws IOException { + String separator = System.getProperty("path.separator"); + File apiBase = InstalledFileLocator.getDefault().locate(ENDORSED_REF, null, true).getParentFile(); + File jaxWsBase = apiBase.getParentFile(); + + FileFilter jarFilter = new FileFilter() { + public boolean accept(File pathname) { + return pathname.isFile() && pathname.getName().endsWith(".jar"); + } + }; + + File[] apiJars = apiBase.listFiles(jarFilter); + File[] implJars = jaxWsBase.listFiles(jarFilter); + + Properties result = new Properties(); + StringBuffer classpath = new StringBuffer(); + + for (int i = 0; i < apiJars.length; i++) { + String pathElement = apiJars[i].getAbsolutePath() + separator; + classpath.append(pathElement); + } + + for (int i = 0; i < implJars.length; i++) { + classpath.append(implJars[i].getAbsolutePath()); + if (i != implJars.length - 1) { + classpath.append(separator); + } + } + + result.setProperty(JAXWS_LIB_PROPERTY, classpath.toString()); + + FileOutputStream fos = new FileOutputStream(target); + result.store(fos, "build.properties file"); + } + + public static final class TestRepository extends Repository { + static FileSystem defaultFileSystem = null; + + public TestRepository() { + super(defaultFileSystem); + } + } + + // Taken from org.openide.filesystems.ExternalUtil to allow layer files to be + // loaded into the default filesystem (since core/startup is in the classpath + // and registers a default Repository that we do not want) + public static final class MainFS extends MultiFileSystem implements LookupListener { + private final Lookup.Result ALL = Lookup.getDefault().lookupResult(FileSystem.class); + private final FileSystem MEMORY = FileUtil.createMemoryFileSystem(); + private final XMLFileSystem layers = new XMLFileSystem(); + + private final LocalFileSystem configRoot = new LocalFileSystem(); + + public void setConfigRootDir(File root) throws Exception { + configRoot.setRootDirectory(root); + } + + public MainFS() { + ALL.addLookupListener(this); + + List layerUrls = new ArrayList(); + ClassLoader l = Thread.currentThread().getContextClassLoader(); + try { + for (URL manifest : NbCollections.iterable(l.getResources("META-INF/MANIFEST.MF"))) { // NOI18N + InputStream is = manifest.openStream(); + try { + Manifest mani = new Manifest(is); + String layerLoc = mani.getMainAttributes().getValue("OpenIDE-Module-Layer"); // NOI18N + if (layerLoc != null) { + URL layer = l.getResource(layerLoc); + if (layer != null) { + layerUrls.add(layer); + } + } + } finally { + is.close(); + } + } + layers.setXmlUrls(layerUrls.toArray(new URL[layerUrls.size()])); + } catch (Exception x) { + } + resultChanged(null); // run after add listener - see PN1 in #26338 + } + + private FileSystem[] computeDelegates() { + List arr = new ArrayList(); + arr.add(MEMORY); + arr.add(layers); + arr.add(configRoot); + arr.addAll(ALL.allInstances()); + return arr.toArray(new FileSystem[0]); + } + + public void resultChanged(LookupEvent ev) { + setDelegates(computeDelegates()); + } + } + + +} diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/manager/test/WebServiceManagerEvent.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/manager/test/WebServiceManagerEvent.java Wed Mar 23 16:50:27 2011 -0400 @@ -0,0 +1,48 @@ +/* + * 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): + * + * Portions Copyrighted 2007 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.websvc.manager.test; + +/** + * + * @author quynguyen + */ +public class WebServiceManagerEvent { + private final String data; + + public WebServiceManagerEvent(String data) { + this.data = data; + } + + public String getData() { + return data; + } +} diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/manager/test/WebServiceManagerListener.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/manager/test/WebServiceManagerListener.java Wed Mar 23 16:50:27 2011 -0400 @@ -0,0 +1,41 @@ +/* + * 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): + * + * Portions Copyrighted 2007 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.websvc.manager.test; + +/** + * Generic listener for test classes + * + * @author quynguyen + */ +public interface WebServiceManagerListener { + public void eventFired(WebServiceManagerEvent event); +} diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/saas/model/SaasServicesModelTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/saas/model/SaasServicesModelTest.java Wed Mar 23 16:50:27 2011 -0400 @@ -0,0 +1,186 @@ +/* + * 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]" + * + * 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 2008 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.websvc.saas.model; + +import org.netbeans.junit.NbTestCase; +import org.netbeans.modules.websvc.saas.spi.websvcmgr.WsdlData; +import org.netbeans.modules.websvc.saas.util.SetupUtil; +import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileUtil; +import java.io.OutputStream; +import org.netbeans.modules.websvc.saas.util.SaasUtil; + +/** + * + * @author nam + */ +public class SaasServicesModelTest extends NbTestCase { + + public static void resetSaasServicesModel() { + SaasServicesModel.getInstance().reset(); + } + + public static void setWsdlData(WsdlSaas saas, WsdlData data) { + saas.setWsdlData(data); + } + + public SaasServicesModelTest(String testName) { + super(testName); + } + + @Override + protected void setUp() throws Exception { + SetupUtil.commonSetUp(super.getWorkDir()); + } + + @Override + protected void tearDown() throws Exception { + SetupUtil.commonTearDown(); + } + + public void testLoading() throws Exception { + + SaasServicesModel instance = SaasServicesModel.getInstance(); + assertEquals("Zillow", instance.getGroups().get(1).getName()); + //No Sub-group for now + //SaasGroup group = instance.getGroups().get(0).getChildGroup("Videos"); + //assertNotNull(group); + SaasGroup group = instance.getGroups().get(1); + WadlSaas service = (WadlSaas) group.getServices().get(0); + assertEquals("Real Estate Service", service.getDisplayName()); + assertNotNull(service.getWadlModel()); + + SetupUtil.commonTearDown(); + } + + public void testAddGroup() throws Exception { + + SaasServicesModel instance = SaasServicesModel.getInstance(); + instance.createGroup(instance.getRootGroup(), "groupA"); + SaasGroup added = instance.getRootGroup().getChildGroup("groupA"); + assertEquals("groupA", added.getName()); + instance.createGroup(added, "child1"); + SaasGroup child2 = instance.createGroup(added, "child2"); + instance.createGroup(child2, "grandChild"); + + instance.reset(); + instance.initRootGroup(); + + SaasGroup reloaded = instance.getRootGroup().getChildGroup("groupA"); + assertEquals("groupA", reloaded.getName()); + assertEquals(2, reloaded.getChildrenGroups().size()); + assertEquals("child1", reloaded.getChildGroup("child1").getName()); + assertEquals("grandChild", reloaded.getChildGroup("child2").getChildGroup("grandChild").getName()); + + SetupUtil.commonTearDown(); + } + + public void testAddToPrePackagedGroup() throws Exception { + + System.out.println(getWorkDirPath()); + SaasServicesModel instance = SaasServicesModel.getInstance(); + SaasGroup delicious = instance.getTopGroup("Delicious"); + assertFalse(delicious.isUserDefined()); + assertNotNull(delicious.getChildService("Bookmarking Service")); + instance.createGroup(delicious, "myDelicious"); + assertTrue(delicious.getChildGroup("myDelicious").isUserDefined()); + assertNotNull(delicious.getChildService("Bookmarking Service")); + + instance.reset(); + instance.initRootGroup(); + + delicious = instance.getTopGroup("Delicious"); + assertFalse(delicious.isUserDefined()); + assertNotNull(delicious.getChildGroup("myDelicious")); + assertTrue(delicious.getChildGroup("myDelicious").isUserDefined()); + assertNotNull(delicious.getChildService("Bookmarking Service")); + + } + + private FileObject setupLocalWadl() throws Exception { + FileObject workDir = FileUtil.toFileObject(getWorkDir()); + FileObject wadl = workDir.getFileObject("application.wadl.xml"); + if (wadl == null) { + wadl = workDir.createData("application.wadl.xml"); + } + OutputStream out = wadl.getOutputStream(); + try { + FileUtil.copy(getClass().getResourceAsStream("application.wadl"), out); + } finally { + out.close(); + } + return wadl; + } + + public void testAddWadlService() throws Exception { + FileObject wadl = setupLocalWadl(); + + String url = wadl.getURL().toExternalForm(); + SaasServicesModel instance = SaasServicesModel.getInstance(); + SaasGroup delicious = instance.getTopGroup("Delicious"); + SaasGroup myDelicious = instance.createGroup(delicious, "myDelicious"); + WadlSaas saas = (WadlSaas) instance.createSaasService(myDelicious, url, null); + assertEquals(1, saas.getResources().size()); + } + + public void testRemoveGroupWithWadlService() throws Exception { + FileObject wadl = setupLocalWadl(); + + String url = wadl.getURL().toExternalForm(); + SaasServicesModel instance = SaasServicesModel.getInstance(); + SaasGroup delicious = instance.getTopGroup("Delicious"); + SaasGroup myDelicious = instance.createGroup(delicious, "myDelicious"); + instance.createSaasService(myDelicious, url, null); + + instance.reset(); + + SaasGroup g = instance.getTopGroup("Delicious").getChildGroup("myDelicious"); + WadlSaas saas = (WadlSaas)g.getServices().get(0); + assertEquals(1, saas.getResources().get(0).getMethods().size()); + assertNotNull(instance.getWebServiceHome().getFileObject(SaasUtil.toValidJavaName(saas.getDisplayName()))); + + instance.removeGroup(g); + assertNull(instance.getWebServiceHome().getFileObject(SaasUtil.toValidJavaName(saas.getDisplayName()))); + assertNull(instance.getTopGroup("Delicious").getChildGroup("myDelicious")); + } +} diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/saas/util/DialogDisplayerNotifier.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/saas/util/DialogDisplayerNotifier.java Wed Mar 23 16:50:27 2011 -0400 @@ -0,0 +1,56 @@ +/* + * 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): + * + * Portions Copyrighted 2007 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.websvc.saas.util; + +import java.awt.Dialog; +import java.util.LinkedList; +import org.openide.DialogDescriptor; +import org.openide.DialogDisplayer; +import org.openide.NotifyDescriptor; + +/** + * + * @author quynguyen + */ +public class DialogDisplayerNotifier extends DialogDisplayer { + + @Override + public Object notify(NotifyDescriptor descriptor) { + return NotifyDescriptor.OK_OPTION; + } + + @Override + public Dialog createDialog(DialogDescriptor descriptor) { + return null; + } + +} diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/saas/util/InstalledFileLocatorImpl.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/saas/util/InstalledFileLocatorImpl.java Wed Mar 23 16:50:27 2011 -0400 @@ -0,0 +1,89 @@ +/* + * 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): + * + * Portions Copyrighted 2007 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.websvc.saas.util; + +import java.io.File; +import java.util.ArrayList; +import org.openide.modules.InstalledFileLocator; + +/** + * InstalledFileLocator implementation that searches the NB install directory + * (uses java.endorsed.dirs value from nbproject/project.properties) + * @author quynguyen + */ +public class InstalledFileLocatorImpl extends InstalledFileLocator { + + private ArrayList baseDirs; + private File userDirConfigRoot; + + public InstalledFileLocatorImpl() { + super(); + File endorsedDir = new File(System.getProperty("java.endorsed.dirs")); + for (int i = 0; i < 5; i++) { + endorsedDir = endorsedDir.getParentFile(); + } + + File installRoot = endorsedDir; + File[] subdirs = installRoot.listFiles(); + baseDirs = new ArrayList(); + + for (int i = 0; subdirs != null && i < subdirs.length; i++) { + if (subdirs[i].isDirectory()) { + baseDirs.add(subdirs[i]); + } + } + } + + @Override + public File locate(String relativePath, String codeNameBase, boolean localized) { + for (File baseDir : baseDirs) { + File f = new File(baseDir, relativePath); + if (f.exists()) { + return f; + } + } + + return null; + } + + public void setUserConfigRoot(File baseDir) { + if (userDirConfigRoot != null) { + baseDirs.remove(userDirConfigRoot); + userDirConfigRoot = null; + } + + if (baseDir != null) { + baseDirs.add(baseDir); + userDirConfigRoot = baseDir; + } + } +} diff -r bbc8dd036333 -r c85dcf71e424 visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/saas/util/SetupUtil.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/visualweb.websvcmgr/test/unit/src/org/netbeans/modules/websvc/saas/util/SetupUtil.java Wed Mar 23 16:50:27 2011 -0400 @@ -0,0 +1,193 @@ +/* + * 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): + * + * Portions Copyrighted 2007 Sun Microsystems, Inc. + */ + +package org.netbeans.modules.websvc.saas.util; + +import java.io.File; +import java.io.FileFilter; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import java.util.jar.Manifest; +import org.netbeans.junit.MockServices; +import org.netbeans.modules.websvc.saas.model.SaasServicesModel; +import org.netbeans.modules.websvc.saas.model.SaasServicesModelTest; +import org.openide.filesystems.FileObject; +import org.openide.filesystems.FileSystem; +import org.openide.filesystems.FileUtil; +import org.openide.filesystems.LocalFileSystem; +import org.openide.filesystems.MultiFileSystem; +import org.openide.filesystems.Repository; +import org.openide.filesystems.XMLFileSystem; +import org.openide.modules.InstalledFileLocator; +import org.openide.util.Lookup; +import org.openide.util.LookupEvent; +import org.openide.util.LookupListener; +import org.openide.util.NbCollections; + +/** + * + * @author quynguyen + */ +public class SetupUtil { + + private static final String ENDORSED_REF = "modules/ext/jaxws21/api/jaxws-api.jar"; + private static final String JAXWS_LIB_PROPERTY = "libs.jaxws21.classpath"; + + public static void commonSetUp(File workingDir) throws Exception { + File testuserdir = new File(workingDir.getParentFile(), "testuser"); + System.getProperties().setProperty("netbeans.user", testuserdir.getAbsolutePath()); + SaasServicesModelTest.resetSaasServicesModel(); + FileObject websvcHome = SaasServicesModel.getWebServiceHome(); + File userconfig = FileUtil.toFile(websvcHome.getParent()); + MainFS fs = new MainFS(); + fs.setConfigRootDir(userconfig); + TestRepository.defaultFileSystem = fs; + + MockServices.setServices(DialogDisplayerNotifier.class, InstalledFileLocatorImpl.class, TestRepository.class); + + InstalledFileLocatorImpl locator = (InstalledFileLocatorImpl)Lookup.getDefault().lookup(InstalledFileLocator.class); + locator.setUserConfigRoot(userconfig); + + File targetBuildProperties = new File(testuserdir, "build.properties"); + generatePropertiesFile(targetBuildProperties); + + } + + public static void commonTearDown() throws Exception { + SaasServicesModel.getWebServiceHome().delete(); + MockServices.setServices(); + } + + private static void generatePropertiesFile(File target) throws IOException { + String separator = System.getProperty("path.separator"); + File apiBase = InstalledFileLocator.getDefault().locate(ENDORSED_REF, null, true).getParentFile(); + File jaxWsBase = apiBase.getParentFile(); + + FileFilter jarFilter = new FileFilter() { + public boolean accept(File pathname) { + return pathname.isFile() && pathname.getName().endsWith(".jar"); + } + }; + + File[] apiJars = apiBase.listFiles(jarFilter); + File[] implJars = jaxWsBase.listFiles(jarFilter); + + Properties result = new Properties(); + StringBuffer classpath = new StringBuffer(); + + for (int i = 0; i < apiJars.length; i++) { + String pathElement = apiJars[i].getAbsolutePath() + separator; + classpath.append(pathElement); + } + + for (int i = 0; i < implJars.length; i++) { + classpath.append(implJars[i].getAbsolutePath()); + if (i != implJars.length - 1) { + classpath.append(separator); + } + } + + result.setProperty(JAXWS_LIB_PROPERTY, classpath.toString()); + + FileOutputStream fos = new FileOutputStream(target); + result.store(fos, "build.properties file"); + } + + public static final class TestRepository extends Repository { + static FileSystem defaultFileSystem = null; + + public TestRepository() { + super(defaultFileSystem); + } + } + + // Taken from org.openide.filesystems.ExternalUtil to allow layer files to be + // loaded into the default filesystem (since core/startup is in the classpath + // and registers a default Repository that we do not want) + public static final class MainFS extends MultiFileSystem implements LookupListener { + private final Lookup.Result ALL = Lookup.getDefault().lookupResult(FileSystem.class); + private final FileSystem MEMORY = FileUtil.createMemoryFileSystem(); + private final XMLFileSystem layers = new XMLFileSystem(); + + private final LocalFileSystem configRoot = new LocalFileSystem(); + + public void setConfigRootDir(File root) throws Exception { + configRoot.setRootDirectory(root); + } + + public MainFS() { + ALL.addLookupListener(this); + + List layerUrls = new ArrayList(); + ClassLoader l = Thread.currentThread().getContextClassLoader(); + try { + for (URL manifest : NbCollections.iterable(l.getResources("META-INF/MANIFEST.MF"))) { // NOI18N + InputStream is = manifest.openStream(); + try { + Manifest mani = new Manifest(is); + String layerLoc = mani.getMainAttributes().getValue("OpenIDE-Module-Layer"); // NOI18N + if (layerLoc != null) { + URL layer = l.getResource(layerLoc); + if (layer != null) { + layerUrls.add(layer); + } + } + } finally { + is.close(); + } + } + layers.setXmlUrls(layerUrls.toArray(new URL[layerUrls.size()])); + } catch (Exception x) { + } + resultChanged(null); // run after add listener - see PN1 in #26338 + } + + private FileSystem[] computeDelegates() { + List arr = new ArrayList(); + arr.add(MEMORY); + arr.add(layers); + arr.add(configRoot); + arr.addAll(ALL.allInstances()); + return arr.toArray(new FileSystem[0]); + } + + public void resultChanged(LookupEvent ev) { + setDelegates(computeDelegates()); + } + } + + +} diff -r bbc8dd036333 -r c85dcf71e424 visualweb.webui.designtime/nbproject/genfiles.properties --- a/visualweb.webui.designtime/nbproject/genfiles.properties Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.webui.designtime/nbproject/genfiles.properties Wed Mar 23 16:50:27 2011 -0400 @@ -1,5 +1,5 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=ebfbf351 +nbproject/build-impl.xml.data.CRC32=4a78b76c nbproject/build-impl.xml.script.CRC32=b7644caf nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45 diff -r bbc8dd036333 -r c85dcf71e424 visualweb.webui.designtime/nbproject/project.xml --- a/visualweb.webui.designtime/nbproject/project.xml Wed Mar 23 16:49:42 2011 -0400 +++ b/visualweb.webui.designtime/nbproject/project.xml Wed Mar 23 16:50:27 2011 -0400 @@ -187,6 +187,20 @@ + + + unit + + org.netbeans.libs.junit4 + + + + org.netbeans.modules.nbjunit + + + + +

org.netbeans.modules.visualweb.complib org.netbeans.modules.visualweb.designer.jsf