You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/09/13 06:44:00 UTC
[GitHub] ralphbenjamin closed pull request #867: Move the launcher from ide.etc to nb/ide.launcher. Removed the unused…
ralphbenjamin closed pull request #867: Move the launcher from ide.etc to nb/ide.launcher. Removed the unused…
URL: https://github.com/apache/incubator-netbeans/pull/867
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ide.etc/bluejl10n.list b/ide.etc/bluejl10n.list
deleted file mode 100644
index 40488f6636..0000000000
--- a/ide.etc/bluejl10n.list
+++ /dev/null
@@ -1,38 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-ide/bluej-suite/branding/**/Bundle.properties
-ide/bluej-suite/branding/**/*.gif
-ide/bluej-suite/bluej-welcome/**/Bundle.properties
-ide/bluej-suite/bluej-welcome/**/*.png
-ide/bluej-suite/bluej-welcome/**/*.gif
-ide/bluej-suite/bluej-upgrade/**/Bundle.properties
-ide/bluej-suite/changing-defaults/*.png
-ide/bluej-suite/changing-defaults/*.icns
-ide/bluej-ui/src/**/Bundle.properties
-ide/bluej-ui/src/**/*.png
-ide/projectimport/bluej/src/**/Bundle.properties
-ide/projectimport/bluej/src/**/*.gif
-ide/projectimport/bluej/src/**/*.png
-ide/projectimport/bluej/src/**/*.html
-ide/projectimport/bluej/javahelp/**/*.html
-ide/projectimport/bluej/javahelp/**/*.hs
-ide/projectimport/bluej/javahelp/**/*.xml
-ide/projectimport/bluej/javahelp/**/*.jhm
-ide/projectimport/bluej/javahelp/**/*.css
-ide/projectimport/bluej/javahelp/**/*.gif
-ide/projectimport/bluej/javahelp/**/*.png
diff --git a/ide.etc/projectopener/build.xml b/ide.etc/projectopener/build.xml
deleted file mode 100644
index 719065b9ba..0000000000
--- a/ide.etc/projectopener/build.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<project basedir="." default="default" name="projectopener">
- <description>Builds, tests, and runs the project projectopener.</description>
- <import file="nbproject/build-impl.xml"/>
- <import file="nbproject/jnlp-impl.xml"/>
- <target depends="jnlp" name="-post-jar">
- <delete file="dist/lib/javaws.jar" failonerror="false"/>
- </target>
- <!--
-
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
-
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
- -pre-compile-single: called before javac compilation of single file
- -post-compile-single: called after javac compilation of single file
- -pre-compile-test: called before javac compilation of JUnit tests
- -post-compile-test: called after javac compilation of JUnit tests
- -pre-compile-test-single: called before javac compilation of single JUnit test
- -post-compile-test-single: called after javac compilation of single JUunit test
- -pre-jar: called before JAR building
- -post-jar: called after JAR building
- -post-clean: called after cleaning build products
-
- (Targets beginning with '-' are not intended to be called on their own.)
-
- Example of inserting an obfuscator after compilation could look like this:
-
- <target name="-post-compile">
- <obfuscate>
- <fileset dir="${build.classes.dir}"/>
- </obfuscate>
- </target>
-
- For list of available properties check the imported
- nbproject/build-impl.xml file.
-
-
- Another way to customize the build is by overriding existing main targets.
- The targets of interest are:
-
- -init-macrodef-javac: defines macro for javac compilation
- -init-macrodef-junit: defines macro for junit execution
- -init-macrodef-debug: defines macro for class debugging
- -init-macrodef-java: defines macro for class execution
- -do-jar-with-manifest: JAR building (if you are using a manifest)
- -do-jar-without-manifest: JAR building (if you are not using a manifest)
- run: execution of project
- -javadoc-build: Javadoc generation
- test-report: JUnit report generation
-
- An example of overriding the target for project execution could look like this:
-
- <target name="run" depends="projectopener-impl.jar">
- <exec dir="bin" executable="launcher.exe">
- <arg file="${dist.jar}"/>
- </exec>
- </target>
-
- Notice that the overridden target depends on the jar target and not only on
- the compile target as the regular run target does. Again, for a list of available
- properties which you can use, check the target you are overriding in the
- nbproject/build-impl.xml file.
-
- -->
-</project>
diff --git a/ide.etc/projectopener/manifest.mf b/ide.etc/projectopener/manifest.mf
deleted file mode 100644
index 328e8e5bc3..0000000000
--- a/ide.etc/projectopener/manifest.mf
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-
diff --git a/ide.etc/projectopener/master.jnlp b/ide.etc/projectopener/master.jnlp
deleted file mode 100644
index 640ce37387..0000000000
--- a/ide.etc/projectopener/master.jnlp
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jnlp spec="1.0+" codebase="${jnlp.codebase}" href="launch.jnlp">
- <information>
- <title>${APPLICATION.TITLE}</title>
- <vendor>${APPLICATION.VENDOR}</vendor>
- <description>${APPLICATION.DESC}</description>
- <description kind="short">${APPLICATION.DESC.SHORT}</description>
- <homepage href="${APPLICATION.HOMEPAGE}"/>
-<!--${JNLP.ICONS}-->
-<!--${JNLP.OFFLINE.ALLOWED}-->
- </information>
- <security>
- <all-permissions/>
- </security>
- <resources>
-<!--${JNLP.RESOURCES.RUNTIME}-->
-<!--${JNLP.RESOURCES.MAIN.JAR}-->
-<!--${JNLP.RESOURCES.JARS}-->
- </resources>
- <application-desc main-class="${jnlp.main.class}">
-<!--${JNLP.APPLICATION.ARGS}-->
- </application-desc>
-</jnlp>
diff --git a/ide.etc/projectopener/nbproject/build-impl.xml b/ide.etc/projectopener/nbproject/build-impl.xml
deleted file mode 100644
index c9979c0f08..0000000000
--- a/ide.etc/projectopener/nbproject/build-impl.xml
+++ /dev/null
@@ -1,591 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT ***
-*** EDIT ../build.xml INSTEAD ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
- - initialization
- - compilation
- - jar
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - applet
- - cleanup
-
- -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1" basedir=".." default="default" name="projectopener-impl">
- <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
- <!--
- ======================
- INITIALIZATION SECTION
- ======================
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/config.properties"/>
- <property file="nbproject/private/configs/${config}.properties"/>
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/configs/${config}.properties"/>
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <available file="${manifest.file}" property="manifest.available"/>
- <condition property="manifest.available+main.class">
- <and>
- <isset property="manifest.available"/>
- <isset property="main.class"/>
- <not>
- <equals arg1="${main.class}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <condition property="manifest.available+main.class+mkdist.available">
- <and>
- <istrue value="${manifest.available+main.class}"/>
- <isset property="libs.CopyLibs.classpath"/>
- </and>
- </condition>
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="run.jvmargs" value=""/>
- <property name="javac.compilerargs" value=""/>
- <property name="work.dir" value="${basedir}"/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <property name="javac.debug" value="true"/>
- <property name="javadoc.preview" value="true"/>
- <property name="application.args" value=""/>
- <property name="source.encoding" value="${file.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.jar">Must set dist.jar</fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-javac">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}" name="classpath"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <element name="customize" optional="true"/>
- <sequential>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="" srcdir="@{srcdir}" target="${javac.target}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="**/*Test.java"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${run.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <attribute default="" name="stopclassname"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
- </nbjpdareload>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" dir="${work.dir}" fork="true">
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
- <jvmarg line="${run.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute default="${main.class}" name="classname"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" dir="${work.dir}" fork="true">
- <jvmarg line="${run.jvmargs}"/>
- <classpath>
- <path path="${run.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-presetdef-jar">
- <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
- <jar compress="${jar.compress}" jarfile="${dist.jar}">
- <j2seproject1:fileset dir="${build.classes.dir}"/>
- </jar>
- </presetdef>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
- <!--
- ===================
- COMPILATION SECTION
- ===================
- -->
- <target depends="init" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources" name="-do-compile">
- <j2seproject3:depend/>
- <j2seproject3:javac/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <j2seproject3:force-recompile/>
- <j2seproject3:javac excludes="" includes="${javac.includes}"/>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <!--
- ====================
- JAR BUILDING SECTION
- ====================
- -->
- <target depends="init" name="-pre-pre-jar">
- <dirname file="${dist.jar}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- </target>
- <target name="-pre-jar">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
- <j2seproject1:jar/>
- </target>
- <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
- <j2seproject1:jar manifest="${manifest.file}"/>
- </target>
- <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
- <j2seproject1:jar manifest="${manifest.file}">
- <j2seproject1:manifest>
- <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
- </j2seproject1:manifest>
- </j2seproject1:jar>
- <echo>To run this application from the command line without Ant, try:</echo>
- <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
- <property location="${dist.jar}" name="dist.jar.resolved"/>
- <pathconvert property="run.classpath.with.dist.jar">
- <path path="${run.classpath}"/>
- <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
- </pathconvert>
- <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
- </target>
- <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
- <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
- <pathconvert property="run.classpath.without.build.classes.dir">
- <path path="${run.classpath}"/>
- <map from="${build.classes.dir.resolved}" to=""/>
- </pathconvert>
- <pathconvert pathsep=" " property="jar.classpath">
- <path path="${run.classpath.without.build.classes.dir}"/>
- <chainedmapper>
- <flattenmapper/>
- <globmapper from="*" to="lib/*"/>
- </chainedmapper>
- </pathconvert>
- <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
- <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
- <fileset dir="${build.classes.dir}"/>
- <manifest>
- <attribute name="Main-Class" value="${main.class}"/>
- <attribute name="Class-Path" value="${jar.classpath}"/>
- </manifest>
- </copylibs>
- <echo>To run this application from the command line without Ant, try:</echo>
- <property location="${dist.jar}" name="dist.jar.resolved"/>
- <echo>java -jar "${dist.jar.resolved}"</echo>
- </target>
- <target name="-post-jar">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
- <!--
- =================
- EXECUTION SECTION
- =================
- -->
- <target depends="init,compile" description="Run a main class." name="run">
- <j2seproject1:java>
- <customize>
- <arg line="${application.args}"/>
- </customize>
- </j2seproject1:java>
- </target>
- <target depends="init,compile" name="run-single">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <j2seproject1:java classname="${run.class}"/>
- </target>
- <!--
- =================
- DEBUGGING SECTION
- =================
- -->
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <j2seproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile" name="-debug-start-debuggee">
- <j2seproject3:debug>
- <customize>
- <arg line="${application.args}"/>
- </customize>
- </j2seproject3:debug>
- </target>
- <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
- <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
- </target>
- <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <j2seproject3:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <j2seproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- ===============
- JAVADOC SECTION
- ===============
- -->
- <target depends="init" name="-javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" destdir="${dist.javadoc.dir}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}"/>
- </classpath>
- <packageset dir="${src.dir}" excludes="${excludes}" includes="${includes}"/>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
- <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
- =========================
- JUNIT COMPILATION SECTION
- =========================
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
- <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
- =======================
- JUNIT EXECUTION SECTION
- =======================
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <j2seproject3:junit/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <j2seproject3:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
- =======================
- JUNIT DEBUGGING SECTION
- =======================
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <j2seproject3:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}">
- <customize>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="${test.class}"/>
- </customize>
- </j2seproject3:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
- =========================
- APPLET EXECUTION SECTION
- =========================
- -->
- <target depends="init,compile-single" name="run-applet">
- <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
- <j2seproject1:java classname="sun.applet.AppletViewer">
- <customize>
- <arg value="${applet.url}"/>
- </customize>
- </j2seproject1:java>
- </target>
- <!--
- =========================
- APPLET DEBUGGING SECTION
- =========================
- -->
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
- <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
- <j2seproject3:debug classname="sun.applet.AppletViewer">
- <customize>
- <arg value="${applet.url}"/>
- </customize>
- </j2seproject3:debug>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
- <!--
- ===============
- CLEANUP SECTION
- ===============
- -->
- <target depends="init" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="-do-clean">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-</project>
diff --git a/ide.etc/projectopener/nbproject/configs/JWS_generated.properties b/ide.etc/projectopener/nbproject/configs/JWS_generated.properties
deleted file mode 100644
index d811a5be6e..0000000000
--- a/ide.etc/projectopener/nbproject/configs/JWS_generated.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$label=Web Start
-$target.debug=jws-debug
-$target.run=jws-run
diff --git a/ide.etc/projectopener/nbproject/genfiles.properties b/ide.etc/projectopener/nbproject/genfiles.properties
deleted file mode 100644
index 320db6c184..0000000000
--- a/ide.etc/projectopener/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=493b3b05
-build.xml.script.CRC32=42a065f6
-build.xml.stylesheet.CRC32=a12b3d02
-# 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=4ebbf3cd
-nbproject/build-impl.xml.script.CRC32=8eeec8c9
-nbproject/build-impl.xml.stylesheet.CRC32=63777ebe
diff --git a/ide.etc/projectopener/nbproject/jnlp-impl.xml b/ide.etc/projectopener/nbproject/jnlp-impl.xml
deleted file mode 100644
index 241d651ae1..0000000000
--- a/ide.etc/projectopener/nbproject/jnlp-impl.xml
+++ /dev/null
@@ -1,423 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<project name="jnlp-impl" default="default" basedir="..">
-
- <property name="master.jnlp.file" location="master.jnlp"/>
- <property name="launch.jnlp.file" value="launch.jnlp"/>
- <property name="jnlp.dest.dir" location="dist"/>
-
- <!-- helper file to create list of arguments -->
- <property name="args.file" location="args.txt"/>
-
- <target name="default">
- <echo message="Default target is not set."/>
- </target>
-
- <!-- Main target -->
-
- <target name="jnlp" depends="-test-jnlp-enabled" if="is.jnlp.enabled">
- <antcall target="generate-jnlp"/>
- </target>
-
- <!-- Generate master -->
-
- <target name="-check-for-master.jnlp">
- <available file="${master.jnlp.file}" property="master.jnlp.exists"/>
- </target>
- <target name="jnlp-init-generate-master" depends="-check-for-master.jnlp" unless="master.jnlp.exists">
- <echo file="${master.jnlp.file}"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<jnlp spec="1.0+" codebase="$${jnlp.codebase}" href="launch.jnlp">
- <information>
- <title>$${APPLICATION.TITLE}</title>
- <vendor>$${APPLICATION.VENDOR}</vendor>
- <description>$${APPLICATION.DESC}</description>
- <description kind="short">$${APPLICATION.DESC.SHORT}</description>
- <homepage href="$${APPLICATION.HOMEPAGE}"/>
-<!--$${JNLP.ICONS}-->
-<!--$${JNLP.OFFLINE.ALLOWED}-->
- </information>
-<!--$${JNLP.SECURITY}-->
- <resources>
-<!--$${JNLP.RESOURCES.RUNTIME}-->
-<!--$${JNLP.RESOURCES.MAIN.JAR}-->
-<!--$${JNLP.RESOURCES.JARS}-->
- </resources>
- <application-desc main-class="$${jnlp.main.class}">
-<!--$${JNLP.APPLICATION.ARGS}-->
- </application-desc>
-</jnlp>
-]]></echo>
- </target>
-
- <!-- -->
-
- <target name="-init-check">
- <fail unless="application.title" message="Must set application title."/>
- <fail unless="application.vendor" message="Must set application vendor."/>
- </target>
-
- <!-- Icons -->
-
- <target name="-init-icons" depends="-preinit-icons,-set-icon-elem,-set-splash-elem">
- <property name="jnlp.icon.elem" value=""/>
- <property name="application.splash.elem" value=""/>
- <property name="icon.separator" value=""/>
- <property name="jnlp.icons.value" value="${jnlp.icon.elem}${icon.separator}${application.splash.elem}"/>
- </target>
- <target name="-preinit-icons" depends="-copy-app-icon,-copy-app-splash"/>
- <target name="-copy-app-icon" if="jnlp.icon" depends="-get-app-icon-name">
- <copy file="${jnlp.icon}" todir="${jnlp.dest.dir}" failonerror="false"/>
- <available file="${jnlp.dest.dir}${file.separator}${jnlp.icon.name}" property="jnlp.icon.copied"/>
- </target>
- <target name="-copy-app-splash" if="application.splash" depends="-get-app-splash-name">
- <copy file="${application.splash}" todir="${jnlp.dest.dir}" failonerror="false"/>
- <available file="${jnlp.dest.dir}${file.separator}${application.splash.name}" property="application.splash.copied"/>
- </target>
- <target name="-get-app-icon-name" if="jnlp.icon">
- <dirname file="${jnlp.icon}" property="jnlp.icon.basedir"/>
- <pathconvert property="jnlp.icon.name" setonempty="false">
- <path location="${jnlp.icon}"/>
- <map from="${jnlp.icon.basedir}${file.separator}" to=""/>
- </pathconvert>
- </target>
- <target name="-get-app-splash-name" if="application.splash">
- <dirname file="${application.splash}" property="application.splash.basedir"/>
- <pathconvert property="application.splash.name" setonempty="false">
- <path location="${application.splash}"/>
- <map from="${application.splash.basedir}${file.separator}" to=""/>
- </pathconvert>
- </target>
- <target name="-set-icon-elem" if="jnlp.icon.copied">
- <property name="jnlp.icon.elem" value=' <icon href="${jnlp.icon.name}" kind="default"/>'/>
- </target>
- <target name="-set-splash-elem" if="application.splash.copied" depends="-set-icon-elem">
- <property name="application.splash.elem" value=' <icon href="${application.splash.name}" kind="splash"/>'/>
- <condition property="icon.separator" value="${line.separator}">
- <isset property="jnlp.icon.elem"/>
- </condition>
- </target>
-
- <!-- Offline-Allowed -->
-
- <target name="-init-offline" if="offline.allowed.set" depends="-preinit-offline">
- <property name="jnlp.offline.allowed.value" value=" <offline-allowed/>"/>
- </target>
- <target name="-preinit-offline">
- <condition property="offline.allowed.set">
- <equals arg1="${jnlp.offline-allowed}" arg2="true" trim="true"/>
- </condition>
- </target>
-
- <!-- Descriptions -->
-
- <target name="-init-descriptions" depends="-descriptions-props-check,-init-desc-value,-init-desc-value-short">
- <property name="application.desc.value" value="${application.title}"/>
- <property name="application.desc.short.value" value="${application.title}"/>
- </target>
- <target name="-descriptions-props-check">
- <condition property="application.desc.set">
- <and>
- <isset property="application.desc"/>
- <not>
- <equals arg1="${application.desc}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <condition property="application.desc.short.set">
- <and>
- <isset property="application.desc.short"/>
- <not>
- <equals arg1="${application.desc.short}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- </target>
- <target name="-init-desc-value" if="application.desc.set">
- <property name="application.desc.value" value="${application.desc}"/>
- </target>
- <target name="-init-desc-value-short" if="application.desc.short.set">
- <property name="application.desc.short.value" value="${application.desc.short}"/>
- </target>
-
- <!-- Security -->
-
- <!-- Generating JNLP file -->
-
- <target name="generate-jnlp" depends="jnlp-init-generate-master,-init-codebase,-init-resources-jars,-init-application-args,-init-icons,-init-offline,-init-descriptions,jnlp-init-notinited">
- <copy file="master.jnlp" tofile="${jnlp.dest.dir}/${launch.jnlp.file}__" overwrite="true">
- <filterchain>
- <replacestring from="$${jnlp.codebase}" to="${jnlp.codebase.value}"/>
- <replacestring from="<!--$${JNLP.ICONS}-->" to="${jnlp.icons.value}"/>
- <replacestring from="<!--$${JNLP.SECURITY}-->" to="${jnlp.security}"/>
- <replacestring from="<!--$${JNLP.OFFLINE.ALLOWED}-->" to="${jnlp.offline.allowed.value}"/>
- <replacestring from="<!--$${JNLP.RESOURCES.RUNTIME}-->" to="${jnlp.resources.runtime.value}"/>
- <replacestring from="<!--$${JNLP.RESOURCES.MAIN.JAR}-->" to="${jnlp.resources.main.jar.value}"/>
- <replacestring from="<!--$${JNLP.RESOURCES.JARS}-->" to="${jnlp.resources.jars.value}"/>
- <replacestring from="<!--$${JNLP.APPLICATION.ARGS}-->" to="${jnlp.application.args.value}"/>
- <replacestring from="$${APPLICATION.TITLE}" to="${application.title}"/>
- <replacestring from="$${APPLICATION.VENDOR}" to="${application.vendor}"/>
- <replacestring from="$${APPLICATION.DESC}" to="${application.desc.value}"/>
- <replacestring from="$${APPLICATION.DESC.SHORT}" to="${application.desc.short.value}"/>
- <replacestring from="$${APPLICATION.HOMEPAGE}" to="${application.homepage}"/>
- <replacestring from="$${jnlp.main.class}" to="${main.class}"/>
- </filterchain>
- </copy>
- <antcall target="-strip-empty-lines"/>
- <antcall target="-generate-html-page"/>
- </target>
-
- <target name="jnlp-init-notinited">
- <property name="jnlp.security" value=""/>
- <property name="jnlp.offline.allowed.value" value=""/>
- <property name="application.homepage" value=""/>
- <property name="jnlp.application.args.value" value=""/>
- </target>
-
- <target name="-strip-empty-lines">
- <move file="${jnlp.dest.dir}/${launch.jnlp.file}__" tofile="${jnlp.dest.dir}/${launch.jnlp.file}" overwrite="true">
- <filterchain>
- <linecontainsregexp>
- <regexp pattern=".+"/>
- </linecontainsregexp>
- </filterchain>
- </move>
- </target>
-
- <!-- Codebase processing -->
-
- <target name="-init-codebase" depends="-codebase-props-check,-init-non-user-codebase,-init-user-codebase"/>
-
- <target name="-codebase-props-check">
- <condition property="local.codebase">
- <or>
- <not>
- <isset property="jnlp.codebase.type"/>
- </not>
- <equals arg1="${jnlp.codebase.type}" arg2="local" trim="true"/>
- </or>
- </condition>
- <condition property="non.user.codebase">
- <or>
- <not>
- <isset property="jnlp.codebase.type"/>
- </not>
- <equals arg1="${jnlp.codebase.type}" arg2="local" trim="true"/>
- <equals arg1="${jnlp.codebase.type}" arg2="web" trim="true"/>
- </or>
- </condition>
- <condition property="user.codebase">
- <equals arg1="${jnlp.codebase.type}" arg2="user" trim="true"/>
- </condition>
- </target>
-
- <target name="-init-non-user-codebase" if="non.user.codebase">
- <property name="jnlp.codebase.value" value="${jnlp.codebase.url}"/>
- </target>
-
- <target name="-init-user-codebase" if="user.codebase">
- <property name="jnlp.codebase.value" value="${jnlp.codebase.user}"/>
- </target>
-
- <!-- j2se resources -->
-
- <target name="-init-resources-runtime" depends="-init-runtime-props">
- <property name="run.jvmargs.value" value=""/>
- <property name="initial-heap-size.value" value=""/>
- <property name="max-heap-size.value" value=""/>
- <property name="jnlp.resources.runtime.value"
- value=' <j2se version="${javac.target}+"${initial-heap-size.value}${max-heap-size.value}${run.jvmargs.value}/>'/>
- </target>
- <target name="-init-runtime-props" depends="-runtime-props-check,-init-run-jvmargs-value,-init-initial-heap-size-value,-init-max-heap-size-value"/>
- <target name="-runtime-props-check">
- <condition property="run.jvmargs.set">
- <and>
- <isset property="run.jvmargs"/>
- <not>
- <equals arg1="${run.jvmargs}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <condition property="jnlp.initial-heap-size.set">
- <and>
- <isset property="jnlp.initial-heap-size"/>
- <not>
- <equals arg1="${jnlp.initial-heap-size}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <condition property="jnlp.max-heap-size.set">
- <and>
- <isset property="jnlp.max-heap-size"/>
- <not>
- <equals arg1="${jnlp.max-heap-size}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- </target>
- <target name="-init-run-jvmargs-value" if="run.jvmargs.set">
- <property name="run.jvmargs.value" value=' java-wm-args="${run.jvmargs}"'/>
- </target>
- <target name="-init-initial-heap-size-value" if="jnlp.initial-heap-size.set">
- <property name="initial-heap-size.value" value=' initial-heap-size="${jnlp.initial-heap-size}"'/>
- </target>
- <target name="-init-max-heap-size-value" if="jnlp.max-heap-size.set">
- <property name="max-heap-size.value" value=' max-heap-size="${jnlp.max-heap-size}"'/>
- </target>
-
- <!-- JAR resources -->
-
- <target name="-init-resources-jars" depends="-preinit-resources-jars,-init-resources-runtime"/>
- <target name="-preinit-resources-jars" depends="-exclude-javaws-from-cp">
- <pathconvert pathsep="${line.separator}" property="jnlp.resources.main.jar.value">
- <path location="${dist.jar}"/>
- <mapper type="regexp" from="^.*[/\\]([^/\\]+\.jar)"
- to=' <jar href="\1" main="true" download="eager"/>'/>
- </pathconvert>
- <pathconvert pathsep="${line.separator}" property="jnlp.resources.jars.value">
- <path path="${run.classpath.without.javaws.jar}"/>
- <mapper type="regexp" from="^.*[/\\]([^/\\]+\.jar)"
- to=' <jar href="lib/\1" download="eager"/>'/>
- </pathconvert>
- </target>
- <target name="-exclude-javaws-from-cp">
- <pathconvert property="path.element.to.be.removed">
- <path path="${run.classpath}"/>
- <mapper type="regexp" from="(^.*[/\\]javaws.jar)" to="\1"/>
- </pathconvert>
- <pathconvert property="run.classpath.without.javaws.jar">
- <path path="${run.classpath}"/>
- <map from="${path.element.to.be.removed}" to=""/>
- </pathconvert>
- </target>
-
- <!-- Application arguments -->
-
- <target name="-init-application-args" if="application.args">
- <echo message="${application.args}" file="${args.file}"/>
- <loadfile srcfile="${args.file}" property="jnlp.application.args.value">
- <filterchain>
- <tokenfilter delimoutput="\n">
- <stringtokenizer/>
- <replaceregex pattern="(.+)" replace=" <argument>\1</argument>"/>
- </tokenfilter>
- </filterchain>
- </loadfile>
- <delete file="${args.file}"/>
- </target>
-
- <!-- Running/Debugging -->
-
- <target name="jws-run" depends="jar,-verify-jnlp-enabled,generate-jnlp,-verify-codebase" description="Start javaws execution">
- <exec executable="${java.home}/bin/javaws">
- <arg line="${jnlp.dest.dir}/${launch.jnlp.file}"/>
- </exec>
- </target>
-
- <target name="jws-debug" if="netbeans.home" depends="jar,-verify-jnlp-enabled,generate-jnlp,-verify-codebase,-debug-start-debugger,-debug-javaws-debuggee"
- description="Debug javaws project in IDE"/>
-
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
-
- <target name="-debug-javaws-debuggee" depends="-init-debug-args">
- <exec executable="${java.home}/bin/javaws">
- <env key="JAVAWS_VM_ARGS" value="${debug-args-line} -Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <arg line="${jnlp.dest.dir}/${launch.jnlp.file}"/>
- </exec>
- </target>
-
- <target name="-verify-codebase" unless="local.codebase">
- <fail message="Project cannot be run with non-local codebase. Open project properties dialog and set Web Start Codebase to Local Execution."/>
- </target>
-
- <target name="-verify-jnlp-enabled" depends="-test-jnlp-enabled" unless="is.jnlp.enabled">
- <fail message="Project cannot be run with selected Run Configuration when Java Web Start is disabled."/>
- </target>
-
- <!-- Signing -->
-
- <property name="jnlp.signjar.default.keystore" location="build/default.keystore"/>
- <property name="jnlp.signjar.default.alias" value="jnlp"/>
- <property name="jnlp.signjar.default.password" value="netbeans"/>
-
- <available property="jnlp.signjar.keystore.exists" file="${jnlp.signjar.keystore}"/>
-
- <target name="jnlp-generate-keystore" unless="jnlp.signjar.keystore.exists">
- <property name="jnlp.signjar.vendor" value="CN=${user.name}"/>
- <echo message="Going to create default keystore in ${jnlp.signjar.keystore}"/>
- <genkey alias="${jnlp.signjar.alias}" keystore="${jnlp.signjar.keystore}"
- storepass="${jnlp.signjar.password}" dname="${jnlp.signjar.vendor}"/>
- </target>
-
- <target name="sign-jars" depends="jnlp-generate-keystore">
- <signjar storepass="${jnlp.signjar.password}" keystore="${jnlp.signjar.keystore}"
- alias="${jnlp.signjar.alias}">
- <fileset dir="${jnlp.dest.dir}">
- <include name="*.jar"/>
- </fileset>
- </signjar>
- </target>
-
- <!-- Test JNLP enabled-->
-
- <target name="-test-jnlp-enabled">
- <condition property="is.jnlp.enabled">
- <equals arg1="${jnlp.enabled}" arg2="true" casesensitive="false" trim="true"/>
- </condition>
- </target>
-
- <!-- -->
-
- <target name="-generate-html-page">
- <echo file="${jnlp.dest.dir}/launch.html"><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
- <head>
- <title>Test page for launching the application via JNLP</title>
- </head>
- <body>
- <h3>Test page for launching the application via JNLP</h3>
- <a href="launch.jnlp">Launch the application</a>
- </body>
-</html>
-]]></echo>
- </target>
-
-</project>
diff --git a/ide.etc/projectopener/nbproject/project.properties b/ide.etc/projectopener/nbproject/project.properties
deleted file mode 100644
index 0980a7aefa..0000000000
--- a/ide.etc/projectopener/nbproject/project.properties
+++ /dev/null
@@ -1,79 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-application.desc=Application for opening projects downloaded from web in NetBeans IDE
-application.homepage=http://www.netbeans.org
-application.title=NetBeans Project Opener
-application.vendor=NetBeans
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=\
- ${run.classpath}
-debug.test.classpath=\
- ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/projectopener.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-jar.compress=false
-javac.classpath=
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
-javac.test.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}:\
- ${libs.junit.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-jnlp.codebase.type=local
-jnlp.codebase.url=file:/E:/sources/netbeans.org/trunk/ide/projectopener/dist
-jnlp.enabled=true
-jnlp.offline-allowed=false
-main.class=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-run.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
- ${javac.test.classpath}:\
- ${build.test.classes.dir}
-src.dir=src
-test.src.dir=test
diff --git a/ide.etc/projectopener/nbproject/project.xml b/ide.etc/projectopener/nbproject/project.xml
deleted file mode 100644
index d25d23da32..0000000000
--- a/ide.etc/projectopener/nbproject/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.java.j2seproject</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
- <name>projectopener</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <source-roots>
- <root id="src.dir"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir"/>
- </test-roots>
- </data>
- </configuration>
-</project>
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/ArgsHandler.java b/ide.etc/projectopener/src/org/netbeans/projectopener/ArgsHandler.java
deleted file mode 100644
index b6b4de5a1e..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/ArgsHandler.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.projectopener;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Milan Kubec
- */
-public class ArgsHandler {
-
- // Arguments will be:
- // projecturl ... project(s) zip file URL, HTTP protocol, REQUIRED parameter
- // minversion ... minumum version of NetBeans that could open the project(s)
- // mainproject ... path (in the zip file) to the project folder that will be opened as main
-
- private String args[];
- private Map argMap = new HashMap();
- private List addArgs = new ArrayList();
-
- public ArgsHandler(String[] args) {
- this.args = args;
- int index = 0;
- while (index < args.length) {
- String arg = args[index];
- if (arg.startsWith("-")) {
- String argName = arg.substring(1);
- if ("projecturl".equals(argName) || "minversion".equals(argName) || "mainproject".equals(argName)) {
- if (args.length >= index + 2) {
- String argVal = args[++index];
- if (!argVal.startsWith("-")) {
- argMap.put(argName, argVal);
- } else {
- // arg is missing value
- argMap.put(argName, null);
- }
- } else {
- // arg is missing value
- argMap.put(argName, null);
- index++;
- }
- } else {
- // unknown args beginning with '-'
- addArgs.add(argName);
- index++;
- }
- } else {
- // there are some args that do not begin with '-'
- index++;
- }
- }
- }
-
- public String getArgValue(String argName) {
- return (String) argMap.get(argName);
- }
-
- public List getAdditionalArgs() {
- return addArgs;
- }
-
- public String getAllArgs() {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < args.length; i++) {
- sb.append(args[i] + " ");
- }
- return sb.toString().trim();
- }
-
-}
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/BrowseNetBeansDialog.form b/ide.etc/projectopener/src/org/netbeans/projectopener/BrowseNetBeansDialog.form
deleted file mode 100644
index f019a1335d..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/BrowseNetBeansDialog.form
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<Form version="1.0" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
- <Properties>
- <Property name="defaultCloseOperation" type="int" value="2"/>
- <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="BrowseNBDialogTitle" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[450, 23]"/>
- </Property>
- </Properties>
- <SyntheticProperties>
- <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
- </SyntheticProperties>
- <AuxValues>
- <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
- <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
- <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,125,0,0,1,-44"/>
- </AuxValues>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
- <SubComponents>
- <Container class="javax.swing.JPanel" name="jPanel1">
- <Properties>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[250, 23]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="Center"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
- <SubComponents>
- <Component class="javax.swing.JLabel" name="jLabel1">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
- <Connection code="getMessage()" type="code"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="8" insetsBottom="12" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JLabel" name="jLabel2">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="InstallDirLabel" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JTextField" name="dirTextField">
- <Properties>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[250, 20]"/>
- </Property>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[300, 20]"/>
- </Property>
- </Properties>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="dirTextField.getDocument().addDocumentListener(new DocListener());"/>
- </AuxValues>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="4" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JButton" name="browseButton">
- <Properties>
- <Property name="mnemonic" type="int" editor="org.netbeans.modules.i18n.form.FormI18nMnemonicEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="BrowseButtonLabel" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="BrowseButtonLabel" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="browseButtonActionPerformed"/>
- </Events>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="2" gridY="1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="1" insetsRight="8" anchor="13" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Container class="javax.swing.JPanel" name="jPanel2">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="3" gridWidth="2" gridHeight="0" fill="0" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
- <SubComponents>
- <Component class="javax.swing.JButton" name="exitButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="ExitButtonLabel" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="exitButtonActionPerformed"/>
- </Events>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="8" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JButton" name="contButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="ContinueButtonLabel" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="contButtonActionPerformed"/>
- </Events>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_AddingCodePost" type="java.lang.String" value="contButton.setEnabled(false);"/>
- </AuxValues>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="8" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- </SubComponents>
- </Container>
- <Container class="javax.swing.JPanel" name="jPanel3">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="3" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="8" insetsBottom="4" insetsRight="8" anchor="17" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
- <SubComponents>
- <Component class="javax.swing.JLabel" name="jLabel3">
- <Properties>
- <Property name="text" type="java.lang.String" value="NetBeans IDE Installer can be downloaded from"/>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JLabel" name="linkLabel">
- <Properties>
- <Property name="text" type="java.lang.String" value="<html><a href="#anchor">NetBeans Download Site</a></html>"/>
- <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="URL_Download_NB" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="linkLabelMouseClicked"/>
- </Events>
- <AuxValues>
- <AuxValue name="JavaCodeGenerator_AddingCodePost" type="java.lang.String" value="linkLabel.setCursor(new Cursor(Cursor.HAND_CURSOR));"/>
- </AuxValues>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="4" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.5" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- </SubComponents>
- </Container>
- </SubComponents>
- </Container>
- </SubComponents>
-</Form>
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/BrowseNetBeansDialog.java b/ide.etc/projectopener/src/org/netbeans/projectopener/BrowseNetBeansDialog.java
deleted file mode 100644
index 86fd401e6f..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/BrowseNetBeansDialog.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.projectopener;
-
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Toolkit;
-import java.io.File;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.UIManager;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.text.BadLocationException;
-import org.netbeans.projectopener.Utils.DialogDescriptor;
-import org.netbeans.projectopener.Utils.NBInstallDir;
-
-/**
- *
- * @author Milan Kubec
- */
-public class BrowseNetBeansDialog extends javax.swing.JDialog {
-
- private DialogDescriptor dialogDesc;
- private NBInstallDir nbDir;
- private String nbVersion;
-
- public BrowseNetBeansDialog(DialogDescriptor dd, NBInstallDir dir, String nbVer) {
- super((JFrame) null, true);
- dialogDesc = dd;
- nbDir = dir;
- nbVersion = nbVer;
- try {
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
- } catch (Exception ex) {
- //
- }
- initComponents();
- getRootPane().setDefaultButton(contButton);
- setLocation(getCenterPoint());
- }
-
- private String getMessage() {
- return "<html>Required version " + nbVersion + " of NetBeans IDE was not found on your computer.<br>" +
- "Do you want to browse required version yourself?</html>";
- }
-
- /** This method is called from within the constructor to
- * initialize the form.
- * WARNING: Do NOT modify this code. The content of this method is
- * always regenerated by the Form Editor.
- */
- // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
- private void initComponents() {
- java.awt.GridBagConstraints gridBagConstraints;
-
- jPanel1 = new javax.swing.JPanel();
- jLabel1 = new javax.swing.JLabel();
- jLabel2 = new javax.swing.JLabel();
- dirTextField = new javax.swing.JTextField();
- browseButton = new javax.swing.JButton();
- jPanel2 = new javax.swing.JPanel();
- exitButton = new javax.swing.JButton();
- contButton = new javax.swing.JButton();
- jPanel3 = new javax.swing.JPanel();
- jLabel3 = new javax.swing.JLabel();
- linkLabel = new javax.swing.JLabel();
-
- setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
- java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/projectopener/Bundle"); // NOI18N
- setTitle(bundle.getString("BrowseNBDialogTitle")); // NOI18N
- setMinimumSize(new java.awt.Dimension(450, 23));
-
- jPanel1.setMinimumSize(new java.awt.Dimension(250, 23));
- jPanel1.setLayout(new java.awt.GridBagLayout());
-
- jLabel1.setText(getMessage());
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.insets = new java.awt.Insets(8, 8, 12, 8);
- jPanel1.add(jLabel1, gridBagConstraints);
-
- jLabel2.setText(bundle.getString("InstallDirLabel")); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.insets = new java.awt.Insets(0, 8, 0, 0);
- jPanel1.add(jLabel2, gridBagConstraints);
-
- dirTextField.setMinimumSize(new java.awt.Dimension(250, 20));
- dirTextField.setPreferredSize(new java.awt.Dimension(300, 20));
- dirTextField.getDocument().addDocumentListener(new DocListener());
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.weightx = 1.0;
- gridBagConstraints.insets = new java.awt.Insets(0, 4, 0, 0);
- jPanel1.add(dirTextField, gridBagConstraints);
-
- browseButton.setMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/projectopener/Bundle").getString("BrowseButtonLabel").charAt(0));
- browseButton.setText(bundle.getString("BrowseButtonLabel")); // NOI18N
- browseButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- browseButtonActionPerformed(evt);
- }
- });
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
- gridBagConstraints.insets = new java.awt.Insets(0, 8, 1, 8);
- jPanel1.add(browseButton, gridBagConstraints);
-
- jPanel2.setLayout(new java.awt.GridBagLayout());
-
- exitButton.setText(bundle.getString("ExitButtonLabel")); // NOI18N
- exitButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- exitButtonActionPerformed(evt);
- }
- });
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.insets = new java.awt.Insets(0, 8, 8, 8);
- jPanel2.add(exitButton, gridBagConstraints);
-
- contButton.setText(bundle.getString("ContinueButtonLabel")); // NOI18N
- contButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- contButtonActionPerformed(evt);
- }
- });
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.insets = new java.awt.Insets(0, 0, 8, 0);
- jPanel2.add(contButton, gridBagConstraints);
- contButton.setEnabled(false);
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 3;
- gridBagConstraints.gridwidth = 2;
- gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
- gridBagConstraints.insets = new java.awt.Insets(12, 0, 0, 0);
- jPanel1.add(jPanel2, gridBagConstraints);
-
- jPanel3.setLayout(new java.awt.GridBagLayout());
-
- jLabel3.setText("NetBeans IDE Installer can be downloaded from");
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.insets = new java.awt.Insets(6, 0, 0, 0);
- jPanel3.add(jLabel3, gridBagConstraints);
-
- linkLabel.setText("<html><a href=\"#anchor\">NetBeans Download Site</a></html>");
- linkLabel.setToolTipText(bundle.getString("URL_Download_NB")); // NOI18N
- linkLabel.addMouseListener(new java.awt.event.MouseAdapter() {
- public void mouseClicked(java.awt.event.MouseEvent evt) {
- linkLabelMouseClicked(evt);
- }
- });
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.weightx = 0.5;
- gridBagConstraints.insets = new java.awt.Insets(6, 4, 0, 0);
- jPanel3.add(linkLabel, gridBagConstraints);
- linkLabel.setCursor(new Cursor(Cursor.HAND_CURSOR));
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridwidth = 3;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.insets = new java.awt.Insets(6, 8, 4, 8);
- jPanel1.add(jPanel3, gridBagConstraints);
-
- getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER);
-
- pack();
- }// </editor-fold>//GEN-END:initComponents
-
-private void linkLabelMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_linkLabelMouseClicked
- dialogDesc.setValue(DialogDescriptor.DOWNLOAD);
- setVisible(false);
-}//GEN-LAST:event_linkLabelMouseClicked
-
-private void exitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exitButtonActionPerformed
- dialogDesc.setValue(DialogDescriptor.EXIT);
- setVisible(false);
-}//GEN-LAST:event_exitButtonActionPerformed
-
-private void contButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_contButtonActionPerformed
- dialogDesc.setValue(DialogDescriptor.CONTINUE);
- nbDir.setInstallDir(new File(dirTextField.getText()));
- setVisible(false);
-}//GEN-LAST:event_contButtonActionPerformed
-
-private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
- JFileChooser chooser = new JFileChooser();
- chooser.setFileSelectionMode (JFileChooser.DIRECTORIES_ONLY);
- chooser.setMultiSelectionEnabled(false);
- // chooser.setSelectedFile(new File(""));
- chooser.setDialogTitle("Browse NetBeans installation");
- if (JFileChooser.APPROVE_OPTION == chooser.showOpenDialog(this)) {
- File file = chooser.getSelectedFile();
- // XXX do validation of entered userdir ???
- dirTextField.setText(file.getAbsolutePath());
- }
-}//GEN-LAST:event_browseButtonActionPerformed
-
- // XXX this method should be moved to Utils
- private Point getCenterPoint() {
- Toolkit toolkit = Toolkit.getDefaultToolkit();
- Dimension screenSize = toolkit.getScreenSize();
- int x = (screenSize.width - getWidth() - getInsets().left - getInsets().right) / 2;
- int y = (screenSize.height - getHeight() - getInsets().top - getInsets().bottom) / 2;
- return new Point(x, y);
- }
-
- private class DocListener implements DocumentListener {
- public void insertUpdate(DocumentEvent de) {
- update(de);
- }
- public void removeUpdate(DocumentEvent de) {
- update(de);
- }
- public void changedUpdate(DocumentEvent de) {
- update(de);
- }
- private void update(DocumentEvent de) {
- String text = null;
- try {
- text = de.getDocument().getText(0, de.getDocument().getLength());
- } catch (BadLocationException ex) {
- //
- }
- File f = new File(text);
- if (f.exists() && f.isDirectory()) {
- contButton.setEnabled(true);
- } else {
- contButton.setEnabled(false);
- }
- }
- }
-
- // Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JButton browseButton;
- private javax.swing.JButton contButton;
- private javax.swing.JTextField dirTextField;
- private javax.swing.JButton exitButton;
- private javax.swing.JLabel jLabel1;
- private javax.swing.JLabel jLabel2;
- private javax.swing.JLabel jLabel3;
- private javax.swing.JPanel jPanel1;
- private javax.swing.JPanel jPanel2;
- private javax.swing.JPanel jPanel3;
- private javax.swing.JLabel linkLabel;
- // End of variables declaration//GEN-END:variables
-
-}
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/Bundle.properties b/ide.etc/projectopener/src/org/netbeans/projectopener/Bundle.properties
deleted file mode 100644
index d84d61f272..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/Bundle.properties
+++ /dev/null
@@ -1,52 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# Properties Bundle for Web Start Project opener application
-#
-
-# Error messages
-ERR_Title=Open NetBeans Project from Web - Error
-ERR_No_Args=No arguments passed, no project to open in NetBeans IDE
-ERR_No_URL=No project URL passed, no project to open in NetBeans IDE
-ERR_Bad_URL=Bad URL of project passed, no project to open in NetBeans IDE
-ERR_Low_Version=Requested version of NetBeans IDE is lower than allowed (5.5.1)
-ERR_Not_Valid_Version=Requested version is not valid for NetBeans IDE
-ERR_No_User_Home=Cannot determine user home directory
-ERR_Download_Failed=Failed to download NetBeans projects zip file
-ERR_Unzip_Failed=Failed to unzip the project, the file may be corrupted
-ERR_Temp_Creation_Failed=Could not create temporary files or folders, the project cannot be downloaded
-ERR_No_Prj_Downloaded=The ZIP file you downloaded does not contain any NetBeans projects
-ERR_No_NB_Userdir_Or_Installdir=Cannot locate NetBeans userdir or install dir
-ERR_No_Launcher=Cannot determine NetBeans launcher name
-
-#NOI18N
-URL_Download_NB=http://services.netbeans.org/downloads/index.php
-
-# Bad Proxy dialog
-BadProxyLabel=Proxy Settings were not detected correctly, please specify HTTP Proxy Settings
-BadProxyDialogTitle=Open NetBeans Project from web - Proxy Settings
-hostLabel=Proxy Host\:
-portLabel=Proxy Port\:
-contButtonLabel=Continue
-exitButtonLabel=Exit
-
-InstallDirLabel=NetBeans install dir\:
-BrowseButtonLabel=Browse ...
-ContinueButtonLabel=Continue
-ExitButtonLabel=Exit
-
-BrowseNBDialogTitle=Open NetBeans Project from Web
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/FileLogHandler.java b/ide.etc/projectopener/src/org/netbeans/projectopener/FileLogHandler.java
deleted file mode 100644
index 30232f9473..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/FileLogHandler.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.projectopener;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Writer;
-import java.util.Date;
-import java.util.logging.Handler;
-import java.util.logging.LogRecord;
-
-/**
- *
- * @author Milan Kubec
- */
-public class FileLogHandler extends Handler {
-
- private Writer writer;
- private String lSep = System.getProperty("line.separator");
-
- /** Creates a new instance of FileLogHandler */
- public FileLogHandler() {
- try {
- File f = new File(File.createTempFile("temp", null).getParentFile(), "projectopener.log");
- writer = new PrintWriter(new FileWriter(f));
- writer.write("--------------------------------------------------------------------------------" + lSep);
- writer.write("NetBeans Project Opener ver. " + WSProjectOpener.APP_VERSION + " - " + new Date().toString() + lSep);
- writer.write("JDK " + System.getProperty("java.version") + "; " + System.getProperty("java.vm.name") + " "
- + System.getProperty("java.vm.version") + lSep);
- writer.write(System.getProperty("os.name") + " version " + System.getProperty("os.version") + " running on "
- + System.getProperty("os.arch") + lSep);
- writer.write("--------------------------------------------------------------------------------" + lSep);
- writer.flush();
- } catch (IOException ex) {
- // ex.printStackTrace();
- }
- }
-
- public void publish(LogRecord record) {
- try {
- writer.write(record.getMessage() + lSep);
- writer.flush();
- } catch (IOException ex) {
- // ex.printStackTrace();
- }
- }
-
- public void flush() {
- try {
- writer.flush();
- } catch (IOException ex) {
- // ex.printStackTrace();
- }
- }
-
- public void close() throws SecurityException {
- try {
- writer.close();
- } catch (IOException ex) {
- // ex.printStackTrace();
- }
- }
-
-}
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/NBInstallation.java b/ide.etc/projectopener/src/org/netbeans/projectopener/NBInstallation.java
deleted file mode 100644
index 429d2b551a..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/NBInstallation.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.projectopener;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- *
- * @author Milan Kubec
- */
-public class NBInstallation {
-
- public static final Comparator VERSION_COMPARATOR = new VersionComparator();
- public static final Comparator LAST_USED_COMPARATOR = new LastUsedComparator();
-
- private static Logger LOGGER = WSProjectOpener.LOGGER;
-
- // there are two versions of log file
- private static final String searchStr1 = "Installation; User Dir.";
- private static final String searchStr2 = "Installation";
-
- // regexp for matching nb cluster, e.g. nb5.5
- private static final Pattern NB_CLUSTER_REGEX = Pattern.compile("[/\\\\]nb(\\d*(\\.\\d+)*)$");
- // regexp for matching start of windows path, e.g. e:\
- private static final Pattern WIN_ROOT_REGEX = Pattern.compile("^[a-zA-Z]:\\\\");
-
- private static final String[] NON_CLUSTER_DIRS = new String[] { "etc", "bin", "harness" };
-
- private File userDir;
- private File installDir;
- private String ideVersion;
-
- private File logFile;
- private File lockFile;
-
- private String versionParts[];
-
- /** Creates a new instance of NetBeansInstallation */
- public NBInstallation(File userDir) {
- this.userDir = userDir;
- logFile = new File(new File(new File(userDir, "var"), "log"), "messages.log");
- ideVersion = findVersion();
- try {
- installDir = findInstallDir();
- } catch (Exception ex) {
- LOGGER.info("Exception during searching for install dir: " + Utils.exc2String(ex));
- }
- versionParts = Utils.getVersionParts(ideVersion);
- lockFile = new File(userDir, "lock");
- }
-
- public boolean isLocked() {
- if (lockFile.exists()) {
- return true;
- }
- return false;
- }
-
- public boolean isValid() {
- if (isNBUserdir() && Utils.getVersionParts(ideVersion) != null &&
- installDir != null && installDir.exists() && installDir.isDirectory() &&
- new File(installDir, "bin").exists()) {
- return true;
- }
- return false;
- }
-
- public File getInstallDir() {
- return installDir;
- }
-
- public File getExecDir() {
- return new File(installDir, "bin");
- }
-
- /**
- * Tries to find important files for each project type in any cluster in installDir,
- * XXX should be extended to look also in userDir!
- */
- public boolean canHandle(Collection c) {
- int toBeFound = 0;
- int foundFiles = 0;
- for (Iterator iter = c.iterator(); iter.hasNext(); ) {
- ProjectType pt = (ProjectType) iter.next();
- String impFiles[] = pt.getImportantFiles();
- toBeFound += impFiles.length;
- String [] clusterPaths = getClusterDirPaths();
- for (int i = 0; i < impFiles.length; i++) {
- String iPath = impFiles[i].replace('/', File.separatorChar);
- for (int j = 0; j < clusterPaths.length; j++) {
- String searchPath = clusterPaths[j] + File.separator + iPath;
- LOGGER.fine("Looking for: " + searchPath);
- File f = new File(searchPath);
- if (f.exists()) {
- LOGGER.info("File: " + f.getAbsolutePath() + " exists.");
- foundFiles++;
- }
- }
- }
- }
- if (foundFiles == toBeFound) {
- return true;
- }
- return false;
- }
-
- /**
- * Returns all dirs under installDir that are not listed in
- * NON_CLUSTER_DIRS, they are considered to be clusters
- */
- public File[] getClusterDirs() {
- File[] dirs = installDir.listFiles(new FileFilter(){
- public boolean accept(File f) {
- if (f.isDirectory()) {
- for (int i = 0; i < NON_CLUSTER_DIRS.length; i++) {
- if (f.getName().equals(NON_CLUSTER_DIRS[i])) {
- return false;
- }
- }
- return true;
- }
- return false;
- }
- });
- return dirs;
- }
-
- private String[] getClusterDirPaths() {
- File[] files = getClusterDirs();
- String dirPaths[] = new String[files.length];
- for (int i = 0; i < files.length; i++) {
- dirPaths[i] = files[i].getAbsolutePath();
- }
- return dirPaths;
- }
-
- public long lastUsed() {
- if (logFile.exists()) {
- return logFile.lastModified();
- }
- return 0L;
- }
-
- // from 5.5.1beta2 => 5.5.1
- public String numVersion() {
- if (versionParts != null && !versionParts[0].equals("")) {
- return versionParts[0];
- }
- // fallback to avoid problems when dev version
- // userdir doesn't have a numeric version
- return "1.0";
- }
-
- // from 5.5.1beta2 => beta
- public String releaseType() {
- if (versionParts != null && !versionParts[1].equals("")) {
- return versionParts[1];
- }
- return "";
- }
-
- // from 5.5.1beta2 => 2
- public String releaseVersion() {
- if (versionParts != null && !versionParts[2].equals("")) {
- return versionParts[2];
- }
- return "";
- }
-
- public String toString() {
- return userDir.getAbsolutePath();
- }
-
- // ---
-
- public static class LastUsedComparator implements Comparator {
-
- public int compare(Object arg0, Object arg1) {
- return signum(((NBInstallation) arg0).lastUsed() -
- ((NBInstallation) arg1).lastUsed());
- }
-
- private int signum(long diff) {
- if (diff > 0) return 1;
- if (diff < 0) return -1;
- return 0;
- }
-
- }
-
- public static class VersionComparator implements Comparator {
-
- public int compare(Object arg0, Object arg1) {
- int retVal = 0;
- String v0 = ((NBInstallation) arg0).numVersion();
- String v1 = ((NBInstallation) arg1).numVersion();
- // this is because dev version doesn't have any numbers,
- // so 'dev' means lower version always
- if (v0.equals("")) {
- retVal = -1;
- } else if (v1.equals("")) {
- retVal = 1;
- }
- if (retVal == 0) {
- retVal = Utils.compareVersions(v0, v1);
- }
- if (retVal == 0) {
- v0 = ((NBInstallation) arg0).releaseType();
- v1 = ((NBInstallation) arg1).releaseType();
- retVal = Utils.compareReleaseTypes(v0, v1);
- }
- if (retVal == 0) {
- v0 = ((NBInstallation) arg0).releaseVersion();
- v1 = ((NBInstallation) arg1).releaseVersion();
- retVal = Utils.compareVersions(v0, v1);
- }
- return retVal;
- }
-
- }
-
- // ---
-
- private File findInstallDir() throws FileNotFoundException, IOException {
- String dirPath = null;
- LOGGER.fine("Parsing file: " + logFile.getAbsolutePath());
- BufferedReader logFileReader = new BufferedReader(new FileReader(logFile));
- String line = logFileReader.readLine();
- boolean lineRead;
-
- while (line != null) {
-
- lineRead = false;
- if (line.indexOf(searchStr1) != -1) { // old version of log file
- LOGGER.fine("Found line: " + line);
- int index1 = line.indexOf('=') + 2;
- int index2 = line.indexOf("; ", index1);
- String subStr = line.substring(index1, index2);
- LOGGER.fine("Found substring: " + subStr);
- StringTokenizer tokenizer = new StringTokenizer(subStr, File.pathSeparator);
- while (tokenizer.hasMoreTokens()) {
- String instPart = tokenizer.nextToken();
- LOGGER.fine("Testing token: " + instPart);
- // regex matcher looking for nb cluster e.g. nb5.5
- Matcher matcher = NB_CLUSTER_REGEX.matcher(instPart);
- if (matcher.find()) {
- File f = new File(instPart).getParentFile();
- LOGGER.fine("Found file: " + f.getAbsolutePath());
- if (f.exists()) {
- dirPath = f.getAbsolutePath();
- }
- }
- }
- } else if (line.indexOf(searchStr2) != -1) { // new version of log file
- LOGGER.fine("Found line: " + line);
- int index = line.indexOf('=') + 2;
- String tLine = line.substring(index).trim();
- boolean matching;
-
- do {
- matching = false;
- // startsWith("/") OR startsWith("e:\")
- if (tLine.startsWith("/") || matchWinRoot(tLine)) { // correct line matched
- matching = true;
- LOGGER.fine("Matching line: " + tLine);
- Matcher matcher = NB_CLUSTER_REGEX.matcher(tLine);
- if (matcher.find()) { // nb cluster matched
- File f = new File(tLine).getParentFile();
- LOGGER.fine("Found file: " + f.getAbsolutePath());
- if (f.exists()) {
- dirPath = f.getAbsolutePath();
- }
- }
- line = logFileReader.readLine();
- lineRead = true;
- tLine = line.trim();
- }
- } while (matching);
-
- }
-
- if (!lineRead) {
- line = logFileReader.readLine();
- }
-
- }
-
- if (dirPath != null) {
- return new File(dirPath);
- } else {
- return null;
- }
- }
-
- private boolean matchWinRoot(String line) {
- Matcher matcher = WIN_ROOT_REGEX.matcher(line);
- return matcher.find();
- }
-
- // XXX the version might be read from log file
- private String findVersion() {
- return userDir.getName();
- }
-
- // check if build.properties and var/log/messages.log files exist
- private boolean isNBUserdir() {
- File buildProps = new File(userDir, "build.properties");
- if (buildProps.exists() && logFile.exists()) {
- return true;
- }
- return false;
- }
-
- // ---
-
- // will be used to validate folder as NB install dir
- // after user selects some folder
- public static boolean isNBInstallation(File f) {
- if (new File(f, "bin").exists()) {
- return true;
- }
- return false;
- }
-
-}
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/ProjectType.java b/ide.etc/projectopener/src/org/netbeans/projectopener/ProjectType.java
deleted file mode 100644
index 17247907b4..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/ProjectType.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.projectopener;
-
-/**
- *
- * @author Milan Kubec
- */
-public class ProjectType {
-
- public static final int UNKNOWN_TYPE = 1;
- public static final int J2SE_TYPE = 2;
- public static final int FREEFORM_TYPE = 3;
- public static final int J2ME_TYPE = 4;
- public static final int WEB_TYPE = 5;
- public static final int EJB_TYPE = 6;
- public static final int EAR_TYPE = 7;
- public static final int MAVEN_TYPE = 7;
-
- public static final String J2SE_NAME = "org.netbeans.modules.java.j2seproject";
- public static final String FREEFORM_NAME = "org.netbeans.modules.ant.freeform";
- public static final String J2ME_NAME = "org.netbeans.modules.kjava.j2meproject";
- public static final String WEB_NAME = "org.netbeans.modules.web.project";
- public static final String EJB_NAME = "org.netbeans.modules.j2ee.ejbjarproject";
- public static final String EAR_NAME = "org.netbeans.modules.j2ee.earproject";
- public static final String MAVEN_NAME = "maven";
-
- public static final ProjectType J2SE = new J2SEProjectType();
- public static final ProjectType FREEFORM = new FreeformProjectType();
- public static final ProjectType J2ME = new J2MEProjectType();
- public static final ProjectType WEB = new WebProjectType();
- public static final ProjectType EJB = new EJBProjectType();
- public static final ProjectType EAR = new EARProjectType();
- public static final ProjectType MAVEN = new MavenProjectType();
-
- private String typeString;
- private String[] importantFiles;
-
- public ProjectType(String type, String[] impFiles) {
- typeString = type;
- importantFiles = impFiles;
- }
-
- public String getTypeString() {
- return typeString;
- }
-
- public String[] getImportantFiles() {
- return importantFiles;
- }
-
- public String toString() {
- return getTypeString();
- }
-
- // ---
-
- public static final class J2SEProjectType extends ProjectType {
- public J2SEProjectType() {
- super(J2SE_NAME, new String[] { "modules/org-netbeans-modules-java-j2seproject.jar" });
- }
- }
-
- public static final class FreeformProjectType extends ProjectType {
- public FreeformProjectType() {
- super(FREEFORM_NAME, new String[] { "modules/org-netbeans-modules-ant-freeform.jar" });
- }
- }
-
- public static final class J2MEProjectType extends ProjectType {
- public J2MEProjectType() {
- super(J2ME_NAME, new String[] { "modules/org-netbeans-modules-kjava-j2meproject.jar" });
- }
- }
-
- public static final class WebProjectType extends ProjectType {
- public WebProjectType() {
- super(WEB_NAME, new String[] { "modules/org-netbeans-modules-web-project.jar" });
- }
- }
-
- public static final class EJBProjectType extends ProjectType {
- public EJBProjectType() {
- super(EJB_NAME, new String[] { "modules/org-netbeans-modules-j2ee-ejbjarproject.jar" });
- }
- }
-
- public static final class EARProjectType extends ProjectType {
- public EARProjectType() {
- super(EAR_NAME, new String[] { "modules/org-netbeans-modules-j2ee-earproject.jar" });
- }
- }
-
- public static final class MavenProjectType extends ProjectType {
- public MavenProjectType() {
- super(MAVEN_NAME, new String[] { "modules/org-codehaus-mevenide-netbeans.jar" });
- }
- }
-
-}
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/ProxySettingsDialog.form b/ide.etc/projectopener/src/org/netbeans/projectopener/ProxySettingsDialog.form
deleted file mode 100644
index 5367481b27..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/ProxySettingsDialog.form
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<Form version="1.0" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
- <Properties>
- <Property name="defaultCloseOperation" type="int" value="2"/>
- <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="BadProxyDialogTitle" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- </Properties>
- <SyntheticProperties>
- <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
- </SyntheticProperties>
- <AuxValues>
- <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
- <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
- <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,-112,0,0,1,-70"/>
- </AuxValues>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
- <SubComponents>
- <Container class="javax.swing.JPanel" name="jPanel1">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="Center"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
- <SubComponents>
- <Component class="javax.swing.JLabel" name="titleLabel">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="BadProxyLabel" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="8" insetsBottom="12" insetsRight="16" anchor="17" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JLabel" name="hostLabel">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="hostLabel" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JLabel" name="portLabel">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="portLabel" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="2" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JTextField" name="hostTextField">
- <Properties>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[200, 20]"/>
- </Property>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[200, 20]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="4" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.8" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JTextField" name="portTextField">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="3" gridY="1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="4" insetsBottom="0" insetsRight="8" anchor="17" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Container class="javax.swing.JPanel" name="jPanel2">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="2" gridY="2" gridWidth="0" gridHeight="0" fill="0" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
- <SubComponents>
- <Component class="javax.swing.JButton" name="contButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="contButtonLabel" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="contButtonActionPerformed"/>
- </Events>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="8" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JButton" name="exitButton">
- <Properties>
- <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString bundle="org/netbeans/projectopener/Bundle.properties" key="exitButtonLabel" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
- </Property>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="exitButtonActionPerformed"/>
- </Events>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="8" insetsBottom="8" insetsRight="8" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- </SubComponents>
- </Container>
- </SubComponents>
- </Container>
- </SubComponents>
-</Form>
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/ProxySettingsDialog.java b/ide.etc/projectopener/src/org/netbeans/projectopener/ProxySettingsDialog.java
deleted file mode 100644
index b093f3c3d3..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/ProxySettingsDialog.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.projectopener;
-
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Toolkit;
-import javax.swing.JFrame;
-import javax.swing.UIManager;
-import org.netbeans.projectopener.Utils.DialogDescriptor;
-import org.netbeans.projectopener.Utils.ProxySettings;
-
-/**
- *
- * @author Milan Kubec
- */
-public class ProxySettingsDialog extends javax.swing.JDialog {
-
- private ProxySettings proxySettings;
- private DialogDescriptor dialogDesc;
-
- /** Creates new form ProxySettingsDialog */
- public ProxySettingsDialog(ProxySettings ps, DialogDescriptor dd) {
- super((JFrame) null, true);
- proxySettings = ps;
- dialogDesc = dd;
- try {
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
- } catch (Exception ex) {
- //
- }
- initComponents();
- getRootPane().setDefaultButton(contButton);
- hostTextField.setText(proxySettings.getProxyHost());
- portTextField.setText(proxySettings.getProxyPort());
- setLocation(getCenterPoint());
- }
-
- /** This method is called from within the constructor to
- * initialize the form.
- * WARNING: Do NOT modify this code. The content of this method is
- * always regenerated by the Form Editor.
- */
- // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
- private void initComponents() {
- java.awt.GridBagConstraints gridBagConstraints;
-
- jPanel1 = new javax.swing.JPanel();
- titleLabel = new javax.swing.JLabel();
- hostLabel = new javax.swing.JLabel();
- portLabel = new javax.swing.JLabel();
- hostTextField = new javax.swing.JTextField();
- portTextField = new javax.swing.JTextField();
- jPanel2 = new javax.swing.JPanel();
- contButton = new javax.swing.JButton();
- exitButton = new javax.swing.JButton();
-
- setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
- java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/projectopener/Bundle"); // NOI18N
- setTitle(bundle.getString("BadProxyDialogTitle")); // NOI18N
-
- jPanel1.setLayout(new java.awt.GridBagLayout());
-
- titleLabel.setText(bundle.getString("BadProxyLabel")); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.insets = new java.awt.Insets(8, 8, 12, 16);
- jPanel1.add(titleLabel, gridBagConstraints);
-
- hostLabel.setText(bundle.getString("hostLabel")); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.insets = new java.awt.Insets(0, 8, 0, 0);
- jPanel1.add(hostLabel, gridBagConstraints);
-
- portLabel.setText(bundle.getString("portLabel")); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.insets = new java.awt.Insets(0, 8, 0, 0);
- jPanel1.add(portLabel, gridBagConstraints);
-
- hostTextField.setMinimumSize(new java.awt.Dimension(200, 20));
- hostTextField.setPreferredSize(new java.awt.Dimension(200, 20));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.weightx = 0.8;
- gridBagConstraints.insets = new java.awt.Insets(0, 4, 0, 0);
- jPanel1.add(hostTextField, gridBagConstraints);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 3;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.insets = new java.awt.Insets(0, 4, 0, 8);
- jPanel1.add(portTextField, gridBagConstraints);
-
- jPanel2.setLayout(new java.awt.GridBagLayout());
-
- contButton.setText(bundle.getString("contButtonLabel")); // NOI18N
- contButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- contButtonActionPerformed(evt);
- }
- });
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.insets = new java.awt.Insets(0, 0, 8, 0);
- jPanel2.add(contButton, gridBagConstraints);
-
- exitButton.setText(bundle.getString("exitButtonLabel")); // NOI18N
- exitButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- exitButtonActionPerformed(evt);
- }
- });
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.insets = new java.awt.Insets(0, 8, 8, 8);
- jPanel2.add(exitButton, gridBagConstraints);
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 2;
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
- gridBagConstraints.insets = new java.awt.Insets(12, 0, 0, 0);
- jPanel1.add(jPanel2, gridBagConstraints);
-
- getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER);
-
- pack();
- }// </editor-fold>//GEN-END:initComponents
-
-private void exitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exitButtonActionPerformed
- dialogDesc.setValue(DialogDescriptor.EXIT);
- setVisible(false);
-}//GEN-LAST:event_exitButtonActionPerformed
-
-private void contButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_contButtonActionPerformed
- dialogDesc.setValue(DialogDescriptor.CONTINUE);
- proxySettings.setProxyHost(stripHttp(hostTextField.getText()));
- proxySettings.setProxyPort(portTextField.getText());
- setVisible(false);
-}//GEN-LAST:event_contButtonActionPerformed
-
- private String stripHttp(String s) {
- if (s.startsWith("http://")) {
- return s.substring("http://".length());
- }
- return s;
- }
-
- private Point getCenterPoint() {
- Toolkit toolkit = Toolkit.getDefaultToolkit();
- Dimension screenSize = toolkit.getScreenSize();
- int x = (screenSize.width - getWidth() - getInsets().left - getInsets().right) / 2;
- int y = (screenSize.height - getHeight() - getInsets().top - getInsets().bottom) / 2;
- return new Point(x, y);
- }
-
- // Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JButton contButton;
- private javax.swing.JButton exitButton;
- private javax.swing.JLabel hostLabel;
- private javax.swing.JTextField hostTextField;
- private javax.swing.JPanel jPanel1;
- private javax.swing.JPanel jPanel2;
- private javax.swing.JLabel portLabel;
- private javax.swing.JTextField portTextField;
- private javax.swing.JLabel titleLabel;
- // End of variables declaration//GEN-END:variables
-
-
-
-}
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/SaveProjectDialog.form b/ide.etc/projectopener/src/org/netbeans/projectopener/SaveProjectDialog.form
deleted file mode 100644
index 68af268097..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/SaveProjectDialog.form
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<Form version="1.0" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
- <Properties>
- <Property name="defaultCloseOperation" type="int" value="2"/>
- </Properties>
- <SyntheticProperties>
- <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
- </SyntheticProperties>
- <AuxValues>
- <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
- <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
- <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,44,0,0,1,-112"/>
- </AuxValues>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
-</Form>
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/SaveProjectDialog.java b/ide.etc/projectopener/src/org/netbeans/projectopener/SaveProjectDialog.java
deleted file mode 100644
index 1a1c18cbda..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/SaveProjectDialog.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.projectopener;
-
-/**
- *
- * @author Milan Kubec
- */
-public class SaveProjectDialog extends javax.swing.JDialog {
-
- /** Creates new form SaveProjectDialog */
- public SaveProjectDialog(java.awt.Frame parent, boolean modal) {
- super(parent, modal);
- initComponents();
- }
-
- /** This method is called from within the constructor to
- * initialize the form.
- * WARNING: Do NOT modify this code. The content of this method is
- * always regenerated by the Form Editor.
- */
- // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
- private void initComponents() {
-
- setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
- getContentPane().setLayout(new java.awt.GridBagLayout());
-
- pack();
- }// </editor-fold>//GEN-END:initComponents
-
- /**
- * @param args the command line arguments
- */
- public static void main(String args[]) {
- java.awt.EventQueue.invokeLater(new Runnable() {
- public void run() {
- SaveProjectDialog dialog = new SaveProjectDialog(new javax.swing.JFrame(), true);
- dialog.addWindowListener(new java.awt.event.WindowAdapter() {
- public void windowClosing(java.awt.event.WindowEvent e) {
- System.exit(0);
- }
- });
- dialog.setVisible(true);
- }
- });
- }
-
- // Variables declaration - do not modify//GEN-BEGIN:variables
- // End of variables declaration//GEN-END:variables
-
-}
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/SavedProjects.java b/ide.etc/projectopener/src/org/netbeans/projectopener/SavedProjects.java
deleted file mode 100644
index c3c561f12f..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/SavedProjects.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.projectopener;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- *
- * @author Milan Kubec
- */
-public class SavedProjects {
-
- private Collection/*<SavedProjects.OneProject>*/ savedProjects;
- private Collection/*<ProjectType>*/ projectTypes;
-
- public SavedProjects(List sp, Collection pt) {
- savedProjects = sp;
- projectTypes = pt;
- }
-
- /**
- * Returns sorted array of stored project's paths
- * @param mainPrjPath is the path in the zip file, separator is '/',
- * last folder in the path is considered to be project name
- */
- public String[] getSortedProjectsPaths(String mainPrjPath) {
- String transMainPrjPath = mainPrjPath.replace('/', File.separatorChar);
- String mainPrjName = transMainPrjPath.substring(transMainPrjPath.lastIndexOf(File.separatorChar) + 1);
- String prjPaths[] = new String[savedProjects.size()];
- String lastPrjPath = null;
- int index = 0;
- for (Iterator iter = savedProjects.iterator(); iter.hasNext(); ) {
- SavedProjects.OneProject sp = (SavedProjects.OneProject) iter.next();
- String prjPath = sp.getProjectPath();
- if (prjPath.indexOf(transMainPrjPath) != -1 &&
- sp.getProjectName().equals(mainPrjName)) {
- lastPrjPath = prjPath;
- } else {
- prjPaths[index++] = prjPath;
- }
- }
- if (lastPrjPath != null) {
- prjPaths[index] = lastPrjPath;
- }
- return prjPaths;
- }
-
- public String[] getProjectPaths() {
- String prjPaths[] = new String[savedProjects.size()];
- int index = 0;
- for (Iterator iter = savedProjects.iterator(); iter.hasNext(); ) {
- SavedProjects.OneProject sp = (SavedProjects.OneProject) iter.next();
- prjPaths[index++] = sp.getProjectPath();
- }
- return prjPaths;
- }
-
- public Collection/*<ProjectType>*/ getTypes() {
- return projectTypes;
- }
-
- public static class OneProject {
-
- private File folder;
-
- public OneProject(File dir) {
- folder = dir;
- }
-
- public String getProjectName() {
- return folder.getName();
- }
-
- public String getProjectPath() {
- return folder.getAbsolutePath();
- }
-
- public String toString() {
- return folder.getAbsolutePath();
- }
-
- }
-
-}
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/UserdirScanner.java b/ide.etc/projectopener/src/org/netbeans/projectopener/UserdirScanner.java
deleted file mode 100644
index a909ff2c62..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/UserdirScanner.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.projectopener;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Milan Kubec
- */
-public class UserdirScanner {
-
- private static Logger LOGGER = WSProjectOpener.LOGGER;
-
- UserdirScanner() {}
-
- public static NBInstallation[] suitableNBInstallations(File homeDir, String minVersion, Comparator comp) {
- File nbUserHome = new File(homeDir, ".netbeans");
- List list = allNBInstallations(nbUserHome);
- LOGGER.info("All found NetBeans installations: " + list);
-
- NBInstallation devNbi = null;
- // find dev NBInstallation
- for (Iterator iter = list.iterator(); iter.hasNext(); ) {
- NBInstallation nbi = (NBInstallation) iter.next();
- // 1.0 version means no version number exists
- if (nbi.numVersion().equals("1.0") &&
- nbi.releaseType().equals("dev") &&
- nbi.releaseVersion().equals("")) {
- devNbi = nbi;
- }
- }
- if (minVersion.equals("dev")) {
- if (devNbi != null) {
- return new NBInstallation[] { devNbi };
- }
- return new NBInstallation[] { };
- }
-
- Collections.sort(list, comp);
- for (ListIterator listIter = list.listIterator(); listIter.hasNext(); ) {
- NBInstallation nbi = (NBInstallation) listIter.next();
- if (Utils.compareVersions(minVersion, nbi.numVersion()) > 0) { // in case we don't want dev builds -> || nbi.releaseType().equals("dev")) {
- listIter.remove();
- }
- }
- Collections.reverse(list);
- // add dev to the end of the list here
- if (devNbi != null) {
- list.add(devNbi);
- }
- return (NBInstallation[]) list.toArray(new NBInstallation[list.size()]);
- }
-
- // returns all valid installations of NB found in ${HOME}/.netbeans
- private static List allNBInstallations(File nbUserHome) {
- File files[] = nbUserHome.listFiles(new FileFilter() {
- public boolean accept(File f) {
- if (f.isDirectory()) {
- return true;
- }
- return false;
- }
- });
- List list = new ArrayList();
- // files might be null here, e.g. if there is no .netbeans folder
- if (files != null) {
- for (int i = 0; i < files.length; i++) {
- // creating NB installation is based on userdir
- NBInstallation nbi = new NBInstallation(files[i]);
- if (nbi.isValid()) {
- list.add(nbi);
- }
- }
- }
- return list;
- }
-
-}
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/Utils.java b/ide.etc/projectopener/src/org/netbeans/projectopener/Utils.java
deleted file mode 100644
index 50c76e51e1..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/Utils.java
+++ /dev/null
@@ -1,650 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.projectopener;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.InetSocketAddress;
-import java.net.MalformedURLException;
-import java.net.Proxy;
-import java.net.ProxySelector;
-import java.net.SocketAddress;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-import javax.jnlp.BasicService;
-import javax.jnlp.FileContents;
-import javax.jnlp.PersistenceService;
-import javax.jnlp.ServiceManager;
-import javax.jnlp.UnavailableServiceException;
-import javax.swing.JOptionPane;
-import javax.swing.UIManager;
-
-/**
- *
- * @author Milan Kubec
- */
-public class Utils {
-
- private static final int BUFF_SIZE = 2048;
-
- private static final String OS_NAME = System.getProperty("os.name").toLowerCase(Locale.US);
-
- private static Logger LOGGER = WSProjectOpener.LOGGER;
-
- private static final String winLauncher = "netbeans.exe";
- private static final String unixLauncher = "netbeans";
- private static final String macLauncher = "netbeans";
-
- private static final int SEARCH_DEPTH = 2;
-
- private static Properties properties;
-
- private static boolean savedProxyUsed = false;
-
- public static File anotherNBDir = null;
-
- Utils() {}
-
- static {
- try {
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
- } catch (Exception ex) {
- // nothing to do
- }
- }
-
- public static void unzip(File srcFile, File destDir) throws IOException {
- InputStream input = null;
- OutputStream output = null;
- ZipFile zipfile = new ZipFile(srcFile);
- Enumeration zipEntries = zipfile.entries();
- while(zipEntries.hasMoreElements()) {
- ZipEntry entry = (ZipEntry) zipEntries.nextElement();
- if (entry.isDirectory()) {
- new File(destDir, entry.getName()).mkdir();
- continue;
- }
- try {
- input = new BufferedInputStream(zipfile.getInputStream(entry));
- File destFile = new File(destDir, entry.getName());
- FileOutputStream fos = new FileOutputStream(destFile);
- output = new BufferedOutputStream(fos);
- copyStreams(input, output);
- } finally {
- if (input != null) {
- input.close();
- }
- if (output != null) {
- output.flush();
- output.close();
- }
- }
- }
- }
-
- public static void download(String urlStr, File destFile) throws IOException {
- URL srcUrl = new URL(urlStr);
- try {
- List list = ProxySelector.getDefault().select(srcUrl.toURI());
- LOGGER.info("List of proxies from Proxy Selector: " + list);
- } catch (Throwable t) {
- // nothing happens, it's just for logging
- }
- InputStream input = null;
- OutputStream output = null;
- try {
- input = srcUrl.openStream();
- FileOutputStream fos = new FileOutputStream(destFile);
- output = new BufferedOutputStream(fos);
- copyStreams(input, output);
- } finally {
- if (input != null) {
- input.close();
- }
- if (output != null) {
- output.flush();
- output.close();
- }
- }
- }
-
- private static void installProxySelector(final String hostName, final int portNum) {
- ProxySelector.setDefault(new ProxySelector() {
- public List select(URI uri) {
- List list = new ArrayList();
- list.add(new Proxy(Proxy.Type.HTTP, new InetSocketAddress(hostName, portNum)));
- return list;
- }
- public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
- //
- }
- });
- }
-
- private static void copyStreams(InputStream input, OutputStream output) throws IOException {
- int count;
- byte data[] = new byte[BUFF_SIZE];
- while ((count = input.read(data, 0, BUFF_SIZE)) != -1) {
- output.write(data, 0, count);
- }
- }
-
- public static File createTempFile(File dir, String prefix, String suffix, boolean delOnExit) throws IOException {
- File tempFile = File.createTempFile(prefix, suffix, dir);
- if (delOnExit) {
- tempFile.deleteOnExit();
- }
- return tempFile;
- }
-
- public static File createTempDir(File dir, String prefix) throws IOException {
- File tempDir = File.createTempFile(prefix, "", dir);
- if (!tempDir.delete()) {
- throw new IOException("Cannot delete file: " + tempDir.getAbsolutePath());
- }
- if (!tempDir.mkdir()) {
- throw new IOException("Cannot create folder: " + tempDir.getAbsolutePath());
- }
- return tempDir;
- }
-
- public static String getPlatformLauncher() {
- String retVal = "";
- if (OS_NAME.indexOf("win") != -1) {
- retVal = winLauncher;
- } else if (OS_NAME.indexOf("unix") != -1) {
- retVal = unixLauncher;
- } else if (OS_NAME.indexOf("linux") != -1) {
- retVal = unixLauncher;
- } else if (OS_NAME.indexOf("mac os") != -1) {
- retVal = macLauncher;
- } else if (OS_NAME.indexOf("solaris") != -1) {
- retVal = unixLauncher;
- } else if (OS_NAME.indexOf("sunos") != -1) {
- retVal = unixLauncher;
- }
- return retVal;
- }
-
- /**
- *
- */
- public static String exc2String(Throwable t) {
- StringWriter writer = new StringWriter();
- t.printStackTrace(new PrintWriter(writer));
- writer.flush();
- return writer.toString();
- }
-
- /**
- *
- */
- public static SavedProjects getSavedProjects(File dir) {
- Set projectTypes = new HashSet();
- List savedProjects = savedNbProjects(dir, 0, projectTypes);
- return new SavedProjects(savedProjects, projectTypes);
- }
-
- // searches also recursively to find nested projects
- private static List savedNbProjects(File dir, int depth, Set pTypes) {
- if (depth > SEARCH_DEPTH) {
- return Collections.EMPTY_LIST;
- }
- List sProjects = new ArrayList();
- File subdirs[] = dir.listFiles(new FileFilter() {
- public boolean accept(File f) {
- if (f.isDirectory()) {
- return true;
- }
- return false;
- }
- });
- for (int i = 0; i < subdirs.length; i++) {
- ProjectType pt = getNbProjectType(subdirs[i]);
- if (pt != null) {
- SavedProjects.OneProject sp = new SavedProjects.OneProject(subdirs[i]);
- sProjects.add(sp);
- pTypes.add(pt);
- }
- sProjects.addAll(savedNbProjects(subdirs[i], depth + 1, pTypes));
- }
- return sProjects;
- }
-
- private static ProjectType getNbProjectType(File f) {
- assert f != null;
- File prjXmlFile = new File(new File(f, "nbproject"), "project.xml");
- if (prjXmlFile.exists() && prjXmlFile.isFile()) {
- switch (getProjectType(f)) {
- case ProjectType.J2SE_TYPE: return ProjectType.J2SE;
- case ProjectType.FREEFORM_TYPE: return ProjectType.FREEFORM;
- case ProjectType.J2ME_TYPE: return ProjectType.J2ME;
- case ProjectType.WEB_TYPE: return ProjectType.WEB;
- case ProjectType.EJB_TYPE: return ProjectType.EJB;
- case ProjectType.EAR_TYPE: return ProjectType.EAR;
- }
- }
- // try other unusual projects:
- // 1) Maven
- File pomFile = new File(f, "pom.xml");
- if (pomFile.exists()) {
- return ProjectType.MAVEN;
- }
- return null;
- }
-
- private static int getProjectType(File f) {
- assert f != null;
- File prjXmlFile = new File(new File(f, "nbproject"), "project.xml");
- if (prjXmlFile.exists() && prjXmlFile.isFile()) {
- BufferedReader reader = null;
- try {
- reader = new java.io.BufferedReader(new java.io.FileReader(prjXmlFile));
- String line = reader.readLine();
- while (line != null) {
- if (line.indexOf("<type>") != -1) {
- return getTypeFromLine(line);
- }
- line = reader.readLine();
- }
- } catch (FileNotFoundException ex) {
- ex.printStackTrace();
- } catch (IOException ioe) {
- ioe.printStackTrace();
- } finally {
- try {
- reader.close();
- } catch (IOException ex) {
- ex.printStackTrace();
- }
- }
- }
- return ProjectType.UNKNOWN_TYPE;
- }
-
- private static int getTypeFromLine(String s) {
- if (s.indexOf("<type>" + ProjectType.J2SE_NAME + "</type>") != -1) {
- return ProjectType.J2SE_TYPE;
- } else if (s.indexOf("<type>" + ProjectType.FREEFORM_NAME + "</type>") != -1) {
- return ProjectType.FREEFORM_TYPE;
- } else if (s.indexOf("<type>" + ProjectType.J2ME_NAME + "</type>") != -1) {
- return ProjectType.J2ME_TYPE;
- } else if (s.indexOf("<type>" + ProjectType.WEB_NAME + "</type>") != -1) {
- return ProjectType.WEB_TYPE;
- } else if (s.indexOf("<type>" + ProjectType.EJB_NAME + "</type>") != -1) {
- return ProjectType.EJB_TYPE;
- } else if (s.indexOf("<type>" + ProjectType.EAR_NAME + "</type>") != -1) {
- return ProjectType.EAR_TYPE;
- }
- return ProjectType.UNKNOWN_TYPE;
- }
-
- public static void showErrMessage(String message, String title) {
- JOptionPane.showMessageDialog(null, message, title, JOptionPane.ERROR_MESSAGE);
- }
-
- public static boolean maybeAnotherProxy() {
-
- if (!savedProxyUsed) {
- // get saved properties from PersistenceService
- String proxyHost = getProperty("jws.http.proxyHost");
- String proxyPort = getProperty("jws.http.proxyPort");
-
- // if there are some valid proxy settings saved already try them
- if (proxyHost != null && !proxyHost.equals("")
- && proxyPort != null && !proxyPort.equals("")) {
- int portNum = Integer.parseInt(proxyPort);
- LOGGER.info("Using saved proxy settings: proxyHost = " +
- proxyHost + ", proxyPort = " + proxyPort);
- installProxySelector(proxyHost, portNum);
- savedProxyUsed = true;
- return true;
- }
- }
-
- // ask user for better proxy settigns
- ProxySettings ps = new ProxySettings();
- DialogDescriptor dd = new DialogDescriptor();
- ProxySettingsDialog pd = new ProxySettingsDialog(ps, dd);
- pd.setVisible(true);
- pd.dispose();
-
- if (dd.getValue().equals(DialogDescriptor.CONTINUE)) {
- // try to install own ProxySelector
- String portNumStr = ps.getProxyPort();
- if (!portNumStr.equals("") && portNumStr != null) {
- String hostName = ps.getProxyHost();
- int portNum = Integer.parseInt(ps.getProxyPort());
- installProxySelector(hostName, portNum);
- // store proxy settings using PersistentService
- setProperty("jws.http.proxyHost", hostName);
- setProperty("jws.http.proxyPort", portNumStr);
- }
- return true;
- } else {
- return false;
- }
-
- }
-
- public static Integer getAnotherNBInstallDir(String nbv) {
- DialogDescriptor dd = new DialogDescriptor();
- NBInstallDir nbd = new NBInstallDir();
- BrowseNetBeansDialog browseNBDialog = new BrowseNetBeansDialog(dd, nbd, nbv);
- browseNBDialog.setVisible(true);
- browseNBDialog.dispose();
- if (dd.getValue() != null) {
- if (dd.getValue().equals(DialogDescriptor.CONTINUE)) {
- anotherNBDir = nbd.getInstallDir();
- return DialogDescriptor.CONTINUE;
- } else if (dd.getValue().equals(DialogDescriptor.DOWNLOAD)) {
- return DialogDescriptor.DOWNLOAD;
- }
- }
- return DialogDescriptor.EXIT;
- }
-
- // ---
-
- public static BasicService getBasicService() {
- BasicService service = null;
- try {
- service = (BasicService) ServiceManager.lookup("javax.jnlp.BasicService");
- } catch (UnavailableServiceException ex) {
- // no service => return null
- }
- return service;
- }
-
- public static PersistenceService getPersistenceService() {
- PersistenceService service = null;
- try {
- service = (PersistenceService) ServiceManager.lookup("javax.jnlp.PersistenceService");
- } catch (UnavailableServiceException ex) {
- // no service => return null
- }
- return service;
- }
-
- // ---
-
- public static String getProperty(String pName) {
- if (properties == null) {
- loadProperties();
- }
- String pVal = properties.getProperty(pName);
- LOGGER.info("Getting property: " + pName + " = " + pVal);
- return pVal;
- }
-
- public static void setProperty(String pName, String pVal) {
- LOGGER.info("Setting property: " + pName + " = " + pVal);
- if (properties == null) {
- loadProperties();
- }
- properties.setProperty(pName, pVal);
- saveProperties();
- }
-
- private static void loadProperties() {
- BasicService bService = getBasicService();
- PersistenceService pService = getPersistenceService();
- properties = new Properties();
- try {
- FileContents fc = pService.get(bService.getCodeBase());
- properties.load(fc.getInputStream());
- } catch (Exception ex) {
- // no props will be loaded
- LOGGER.info(Utils.exc2String(ex));
- }
- }
-
- private static void saveProperties() {
- BasicService bService = getBasicService();
- PersistenceService pService = getPersistenceService();
- URL codeBase = bService.getCodeBase();
- FileContents fc = null;
- try {
- fc = pService.get(codeBase);
- } catch (FileNotFoundException fnfe) {
- try {
- // Entry probably doesn't exist => create it
- // XXX the size is arbitrary
- pService.create(codeBase, 30000L);
- fc = pService.get(codeBase);
- } catch (Exception ex) {
- LOGGER.info(Utils.exc2String(ex));
- }
- } catch (Exception ex) {
- // no props will be saved
- LOGGER.info(Utils.exc2String(ex));
- }
- try {
- properties.store(fc.getOutputStream(true), null);
- } catch (IOException ioe) {
- LOGGER.info(Utils.exc2String(ioe));
- }
- }
-
- // ---
-
- /**
- * Tries to open passed URL in system browser
- * using JNLP BasicService
- */
- public static boolean showDocument(String url) {
- URL url2Show = null;
- try {
- url2Show = new java.net.URL(url);
- } catch (MalformedURLException ex) {
- // nothing much to do here
- }
- BasicService service = getBasicService();
- if (service != null) {
- return service.showDocument(url2Show);
- }
- return false;
- }
-
- // ---
-
- /**
- * Returns parts of the NB version number if it matches the regexp
- * e.g. '1.2.3beta2' = > [0] == 1.2.3, [1] == beta, [2] == 2
- * if not matches returns null
- */
- public static String[] getVersionParts(String s) {
- if (s == null) {
- return null;
- }
- String retVal[] = new String[] { "", "", "" };
- Pattern p = Pattern.compile("(\\d*(\\.\\d+)*)([a-zA-Z]*)(\\d*)");
- Matcher m = p.matcher(s);
- if (m.matches()) {
- retVal[0] = m.group(1);
- retVal[1] = m.group(3);
- retVal[2] = m.group(4);
- return retVal;
- }
- return null;
- }
-
- /**
- * Compares two NB versions (only numbers), e.g. 5.5.1, 6.0,
- * returns negative if first version number parameter is lower than second,
- * positive if first is higher and 0 if both versions are the same
- */
- public static int compareVersions(String verStr1, String verStr2) {
- int vd1[] = parseVersionString(verStr1);
- int vd2[] = parseVersionString(verStr2);
- int len1 = vd1.length;
- int len2 = vd2.length;
- int max = Math.max(len1, len2);
- for (int i = 0; i < max; i++) {
- int d1 = ((i < len1) ? vd1[i] : 0);
- int d2 = ((i < len2) ? vd2[i] : 0);
- if (d1 != d2) {
- return d1 - d2;
- }
- }
- return 0;
- }
-
- /**
- * Compare release types in following way: dev < beta < rc < ""
- */
- public static int compareReleaseTypes(String relType1, String relType2) {
- int retVal = 0;
- if (relType1.equals(relType2)) {
- retVal = 0;
- } else if (relType1.equals("")) {
- retVal = 1;
- } else if (relType2.equals("")) {
- retVal = -1;
- } else if (relType1.equals("dev") && ((relType2.equals("beta") || relType2.equals("rc")))) {
- retVal = -1;
- } else if (relType2.equals("dev") && ((relType1.equals("beta") || relType1.equals("rc")))) {
- retVal = 1;
- } else if (relType1.equals("beta") && relType2.equals("rc")) {
- retVal = -1;
- } else if (relType2.equals("beta") && relType1.equals("rc")) {
- retVal = 1;
- }
- return retVal;
- }
-
- private static int[] parseVersionString(String s) throws NumberFormatException {
- StringTokenizer st = new StringTokenizer(s, ".", true);
- int len = st.countTokens();
- if ((len % 2) == 0) {
- throw new NumberFormatException("Even number of pieces in a spec version: '" + s + "'"); // NOI18N
- }
- int i = 0;
- int[] digits = new int[len / 2 + 1];
- boolean expectingNumber = true;
- while (st.hasMoreTokens()) {
- if (expectingNumber) {
- expectingNumber = false;
- int piece = Integer.parseInt(st.nextToken());
- if (piece < 0) {
- throw new NumberFormatException("Spec version component < 0: " + piece); // NOI18N
- }
- digits[i++] = piece;
- } else {
- if (!".".equals(st.nextToken())) { // NOI18N
- throw new NumberFormatException("Expected dot in spec version: '" + s + "'"); // NOI18N
- }
- expectingNumber = true;
- }
- }
- return digits;
- }
-
- // ---
-
- public static class ProxySettings {
-
- private String proxyHost;
- private String proxyPort;
-
- public ProxySettings() {
- proxyHost = "";
- proxyPort = "";
- }
-
- public ProxySettings(String host, String port) {
- proxyHost = host;
- proxyPort = port;
- }
-
- public String getProxyHost() {
- return proxyHost;
- }
-
- public String getProxyPort() {
- return proxyPort;
- }
-
- public void setProxyHost(String s) {
- proxyHost = s;
- }
-
- public void setProxyPort(String s) {
- proxyPort = s;
- }
-
- }
-
- public static class DialogDescriptor {
-
- public static final Integer EXIT = new Integer(0);
- public static final Integer CONTINUE = new Integer(1);
- public static final Integer DOWNLOAD = new Integer(2);
-
- private Object value;
-
- public DialogDescriptor() {}
-
- public Object getValue() {
- return value;
- }
-
- public void setValue(Object val) {
- value = val;
- }
-
- }
-
- public static class NBInstallDir {
- private File dir;
- public NBInstallDir() {}
- public File getInstallDir() {
- return dir;
- }
- public void setInstallDir(File d) {
- dir = d;
- }
- }
-
-}
diff --git a/ide.etc/projectopener/src/org/netbeans/projectopener/WSProjectOpener.java b/ide.etc/projectopener/src/org/netbeans/projectopener/WSProjectOpener.java
deleted file mode 100644
index 50485513b6..0000000000
--- a/ide.etc/projectopener/src/org/netbeans/projectopener/WSProjectOpener.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.projectopener;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Milan Kubec
- */
-public class WSProjectOpener {
-
- public static String APP_VERSION = "1.1";
-
- public static String MIN_NB_VERSION = "5.5.1";
-
- public static Logger LOGGER = Logger.getLogger("org.netbeans.projectopener.WSProjectOpener");
-
- private static String DEFAULT_USERDIR = "5.5.1";
-
- private static Comparator COMPARATOR = NBInstallation.LAST_USED_COMPARATOR;
-
- private WSProjectOpener() {}
-
- /**
- * @param args the command line arguments
- */
- public static void main(String[] args) {
- new WSProjectOpener().openProject(args);
- }
-
- private void openProject(String args[]) {
-
- ArgsHandler handler = new ArgsHandler(args);
- ResourceBundle bundle = ResourceBundle.getBundle("org/netbeans/projectopener/Bundle"); // NOI18N
-
- // Register own logger that prints messages to ${TEMP}/projectopener.log
- LOGGER.addHandler(new FileLogHandler());
-
- // ######################
- // ### Test Arguments ###
- // ######################
-
- String allArgs = handler.getAllArgs();
- if (allArgs.equals("")) {
- LOGGER.severe("No arguments passed, exiting ..."); // NOI18N
- Utils.showErrMessage(bundle.getString("ERR_No_Args"), bundle.getString("ERR_Title"));
- System.exit(0);
- } else {
- LOGGER.info("Passed arguments: " + handler.getAllArgs()); // NOI18N
- }
-
- // ---
-
- URL prjURL = null;
- String prjURLStr = handler.getArgValue("projecturl"); // NOI18N
- if (prjURLStr == null) {
- LOGGER.severe("Project URL argument not specified, exiting ...");
- Utils.showErrMessage(bundle.getString("ERR_No_URL"), bundle.getString("ERR_Title"));
- System.exit(0);
- } else {
- try {
- prjURL = new URL(prjURLStr);
- } catch (MalformedURLException ex) {
- LOGGER.severe("Exception: " + Utils.exc2String(ex)); // NOI18N
- Utils.showErrMessage(bundle.getString("ERR_Bad_URL"), bundle.getString("ERR_Title"));
- System.exit(0);
- }
- }
- LOGGER.info("Project URL: " + prjURL.toExternalForm()); // NOI18N
-
- // ################################################
- // ### Get user home dir from system properties ###
- // ################################################
-
- String userHome = System.getProperty("user.home"); // NOI18N
- if (userHome != null) {
- LOGGER.info("Userhome: " + userHome); // NOI18N
- } else {
- // XXX Ask for NB installation?
- LOGGER.severe("Cannot determine user home directory, exiting ..."); // NOI18N
- Utils.showErrMessage(bundle.getString("ERR_No_User_Home"), bundle.getString("ERR_Title"));
- System.exit(0);
- }
-
- // ######################################
- // ### Handle required min NB version ###
- // ######################################
-
- String nbVersion = handler.getArgValue("minversion"); // NOI18N
- if (nbVersion == null) {
- nbVersion = DEFAULT_USERDIR;
- LOGGER.info("No NB version specified, using default: " + nbVersion); // NOI18N
- } else {
- LOGGER.info("Requested NB userdir: " + nbVersion);
- String verParts[] = Utils.getVersionParts(nbVersion);
- if (verParts != null && !verParts[0].equals("")) {
- if (Utils.compareVersions(verParts[0], MIN_NB_VERSION) < 0) {
- LOGGER.severe("Requested version is lower than allowed, exiting ..."); // NOI18N
- Utils.showErrMessage(bundle.getString("ERR_Low_Version"), bundle.getString("ERR_Title"));
- System.exit(0);
- }
- } else {
- // nbVersion is not recognized as valid or version is not specified
- // if the version is only 'dev' it's OK
- if ((verParts == null) || (verParts != null && verParts[0].equals("") && !verParts[1].equals("dev"))) {
- LOGGER.severe("Requested version is not valid, exiting ..."); // NOI18N
- Utils.showErrMessage(bundle.getString("ERR_Not_Valid_Version"), bundle.getString("ERR_Title"));
- System.exit(0);
- }
- }
- }
-
- // ######################################################
- // ### Create temp files, download and unzip projects ###
- // ######################################################
-
- File tempFile = null;
- File tempDir = null;
-
- try {
- tempFile = Utils.createTempFile(null, "nbproject", ".zip", true);
- tempDir = Utils.createTempDir(null, "nbproject");
- } catch (IOException ioe) {
- // XXX Ask user for different dir to create temp files
- }
-
- if (tempFile == null || tempDir == null) {
- LOGGER.severe("Temporary file or folder creation failed, project cannot be downloaded, exiting ...");
- Utils.showErrMessage(bundle.getString("ERR_Temp_Creation_Failed"), bundle.getString("ERR_Title"));
- System.exit(0);
- }
-
- LOGGER.info("Temp file: " + tempFile.getAbsolutePath());
- LOGGER.info("Temp project dir: " + tempDir.getAbsolutePath());
-
- try {
- boolean downloadFinished = false;
- while (!downloadFinished) {
- try {
- Utils.download(prjURLStr, tempFile);
- LOGGER.info("Download finished.");
- downloadFinished = true;
- } catch (UnknownHostException uhe) {
- LOGGER.severe("Exception during download operation: " + Utils.exc2String(uhe));
- // Might be problem with Proxy settings
- // look for another proxy and try again
- boolean cont = Utils.maybeAnotherProxy();
- if (!cont) {
- // user selected exit in the dialog
- System.exit(0);
- }
- }
- }
- } catch (IOException ioe) {
- LOGGER.severe("Exception during download operation: " + Utils.exc2String(ioe));
- Utils.showErrMessage(bundle.getString("ERR_Download_Failed"), bundle.getString("ERR_Title"));
- System.exit(0);
- }
-
- try {
- Utils.unzip(tempFile, tempDir);
- LOGGER.info("Unzip finished.");
- } catch (IOException ioe) {
- LOGGER.severe("Exception during unzip operation: " + Utils.exc2String(ioe));
- Utils.showErrMessage(bundle.getString("ERR_Unzip_Failed"), bundle.getString("ERR_Title"));
- System.exit(0);
- }
-
- // ######################################
- // ### Process downloaded NB Projects ###
- // ######################################
-
- String projPaths[] = null;
- SavedProjects sp = Utils.getSavedProjects(tempDir);
- String mainPrjPath = handler.getArgValue("mainproject");
- if (mainPrjPath != null) {
- projPaths = sp.getSortedProjectsPaths(mainPrjPath);
- } else {
- projPaths = sp.getProjectPaths();
- }
-
- if (projPaths.length == 0) {
- LOGGER.severe("No NetBeans projects were downloaded, exiting ...");
- Utils.showErrMessage(bundle.getString("ERR_No_Prj_Downloaded"), bundle.getString("ERR_Title"));
- System.exit(0);
- }
-
- LOGGER.info("Project paths: " + Arrays.asList(projPaths));
-
- // ##################################
- // ### Find right NB Installation ###
- // ##################################
-
- File execDir = null;
- NBInstallation nbis[] = UserdirScanner.suitableNBInstallations(new File(userHome), nbVersion, COMPARATOR);
- LOGGER.info("Suitable NB installations: " + Arrays.asList(nbis).toString());
- if (nbis.length > 0) {
- for (int i = 0; i < nbis.length; i++) {
- // try to find running IDE that can handle downloaded projects
- if (nbis[i].isLocked() && nbis[i].canHandle(sp.getTypes())) {
- LOGGER.info("IDE: " + nbis[i].getInstallDir() + " is already running and can handle downloaded projects.");
- execDir = nbis[i].getExecDir();
- break;
- }
- }
- if (execDir == null) {
- for (int i = 0; i < nbis.length; i++) {
- // try to find any IDE that can handle downloaded projects
- if (nbis[i].canHandle(sp.getTypes())) {
- LOGGER.info("IDE: " + nbis[i].getInstallDir() + " can handle downloaded projects.");
- execDir = nbis[i].getExecDir();
- break;
- }
- }
- }
- }
- // no nb installation found
- if (execDir == null) {
- // XXX look for saved install dir from previous failed search
- // then ask user for another NB install dir and save to properties
- boolean found = false;
- while (!found) {
- Integer cont = Utils.getAnotherNBInstallDir(nbVersion);
- if (cont.equals(Utils.DialogDescriptor.EXIT)) {
- LOGGER.info("User selected Exit when asked for another NB install dir, exiting ...");
- System.exit(0);
- }
- if (cont.equals(Utils.DialogDescriptor.DOWNLOAD)) {
- LOGGER.info("User selected Download, opening the page in browser, exiting ...");
- Utils.showDocument(bundle.getString("URL_Download_NB"));
- System.exit(0);
- }
- File nbDir = Utils.anotherNBDir;
- LOGGER.info("User selected alternative NB install dir: " + nbDir.getAbsolutePath());
- if (NBInstallation.isNBInstallation(nbDir)) {
- execDir = new File(nbDir, "bin");
- // save the installdir to muffin
- Utils.setProperty("jws.netbeans.installdir", nbDir.getAbsolutePath());
- found = true;
- } else {
- LOGGER.info("Selected dir is probably not NB install dir, try again ...");
- }
- }
- }
-
- // probably not necessary
- if (execDir == null) {
- LOGGER.severe("Cannot locate NetBeans userdir or install dir, exiting ...");
- Utils.showErrMessage(bundle.getString("ERR_No_NB_Userdir_Or_Installdir"), bundle.getString("ERR_Title"));
- // XXX Dialog here ???
- Utils.showDocument(bundle.getString("URL_Download_NB"));
- System.exit(0);
- }
- LOGGER.info("Exec dir: " + execDir);
-
- // ##############################
- // ### Find platform launcher ###
- // ##############################
-
- String launcher = Utils.getPlatformLauncher();
- if (launcher == null || "".equals(launcher)) {
- LOGGER.severe("Cannot determine NetBeans launcher name, exiting ...");
- Utils.showErrMessage(bundle.getString("ERR_No_Launcher"), bundle.getString("ERR_Title"));
- // XXX Do you want to save the project?
- System.exit(0);
- }
- LOGGER.info("Launcher name: " + launcher);
-
- // ########################################
- // ### Build command line to launch IDE ###
- // ########################################
-
- List cmdList = new ArrayList();
- cmdList.add(execDir.getAbsolutePath() + File.separator + launcher);
- cmdList.add("--open");
- for (int i = 0; i < projPaths.length; i++) {
- cmdList.add(projPaths[i]);
- }
- String cmdArray[] = (String[]) cmdList.toArray(new java.lang.String[cmdList.size()]);
- LOGGER.info("Command line: " + Arrays.asList(cmdArray));
-
- // ###################
- // ### Run the IDE ###
- // ###################
-
- try {
- Process proc = Runtime.getRuntime().exec(cmdArray, null, execDir);
- // int exitVal = proc.exitValue();
- // LOGGER.info("Process exit value: " + exitVal);
- // XXX Try to log output from the process
- } catch (IOException ioe) {
- LOGGER.severe("Exception during launching NetBeans IDE: " + Utils.exc2String(ioe));
- // XXX Do you want to save the project?
- }
-
- }
-
-}
diff --git a/ide.etc/projectopener/test/org/netbeans/projectopener/ArgsHandlerTest.java b/ide.etc/projectopener/test/org/netbeans/projectopener/ArgsHandlerTest.java
deleted file mode 100644
index a610e65ed1..0000000000
--- a/ide.etc/projectopener/test/org/netbeans/projectopener/ArgsHandlerTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.projectopener;
-
-import junit.framework.TestCase;
-import junit.framework.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author Milan Kubec
- */
-public class ArgsHandlerTest extends TestCase {
-
- public ArgsHandlerTest(String testName) {
- super(testName);
- }
-
- /**
- * Test of getArgValue method, of class org.netbeans.projectopener.ArgsHandler.
- */
- public void testGetArgValue() {
-
- System.out.println("getArgValue");
-
- String prjURLString = "http://www.someurl.com/TheProject.zip";
- String nbVersionString = "1.2.3";
- String mainPrjNameString = "TheMainProject";
- String args[] = new String[] { "-projecturl", prjURLString,
- "-minversion", nbVersionString,
- "-mainproject", mainPrjNameString,
- "-showgui", "-otherarg" };
- List<String> list = new ArrayList<String>();
- list.add("showgui");
- list.add("otherarg");
-
- ArgsHandler handler = new ArgsHandler(args);
- assertEquals(prjURLString, handler.getArgValue("projecturl"));
- assertEquals(nbVersionString, handler.getArgValue("minversion"));
- assertEquals(mainPrjNameString, handler.getArgValue("mainproject"));
- assertEquals(list, handler.getAdditionalArgs());
-
- String args2[] = new String[] { "-projecturl",
- "-minversion", nbVersionString,
- "-showgui" };
- list.clear();
- list.add("showgui");
-
- handler = new ArgsHandler(args2);
- assertEquals(null, handler.getArgValue("projecturl"));
- assertEquals(nbVersionString, handler.getArgValue("minversion"));
- assertEquals(null, handler.getArgValue("mainproject"));
- assertEquals(list, handler.getAdditionalArgs());
-
- }
-
- /**
- * Test of getAdditionalArgs method, of class org.netbeans.projectopener.ArgsHandler.
- */
- // public void testGetAdditionalArgs() { }
-
-}
diff --git a/ide.etc/external/binaries-list b/nb/ide.launcher/external/binaries-list
similarity index 100%
rename from ide.etc/external/binaries-list
rename to nb/ide.launcher/external/binaries-list
diff --git a/ide.etc/external/launchers-9.0-license.txt b/nb/ide.launcher/external/launchers-9.0-license.txt
similarity index 100%
rename from ide.etc/external/launchers-9.0-license.txt
rename to nb/ide.launcher/external/launchers-9.0-license.txt
diff --git a/ide.etc/licenseinfo.xml b/nb/ide.launcher/licenseinfo.xml
similarity index 73%
rename from ide.etc/licenseinfo.xml
rename to nb/ide.launcher/licenseinfo.xml
index aaeb15a0fe..1fd7a2eae8 100644
--- a/ide.etc/licenseinfo.xml
+++ b/nb/ide.launcher/licenseinfo.xml
@@ -21,16 +21,16 @@
-->
<licenseinfo>
<fileset>
- <file>launcher/windows/netbeans.ico</file>
- <file>launcher/macosx/NetBeansLauncher/netbeans.icns</file>
+ <file>windows/netbeans.ico</file>
+ <file>macosx/NetBeansLauncher/netbeans.icns</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
<fileset>
- <file>launcher/macosx/NetBeansLauncher/English.lproj/InfoPlist.strings</file>
- <file>launcher/macosx/NetBeansLauncher/English.lproj/Localizable.strings</file>
- <file>launcher/windows/netbeans.exe.manifest</file>
- <file>launcher/windows/netbeans64.exe.manifest</file>
+ <file>macosx/NetBeansLauncher/English.lproj/InfoPlist.strings</file>
+ <file>macosx/NetBeansLauncher/English.lproj/Localizable.strings</file>
+ <file>windows/netbeans.exe.manifest</file>
+ <file>windows/netbeans64.exe.manifest</file>
<license ref="Apache-2.0-ASF" />
<comment>RAT recognises files as binary</comment>
</fileset>
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/English.lproj/InfoPlist.strings b/nb/ide.launcher/macosx/NetBeansLauncher/English.lproj/InfoPlist.strings
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/English.lproj/InfoPlist.strings
rename to nb/ide.launcher/macosx/NetBeansLauncher/English.lproj/InfoPlist.strings
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/English.lproj/Localizable.strings b/nb/ide.launcher/macosx/NetBeansLauncher/English.lproj/Localizable.strings
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/English.lproj/Localizable.strings
rename to nb/ide.launcher/macosx/NetBeansLauncher/English.lproj/Localizable.strings
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/classes.nib b/nb/ide.launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/classes.nib
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/classes.nib
rename to nb/ide.launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/classes.nib
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/info.nib b/nb/ide.launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/info.nib
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/info.nib
rename to nb/ide.launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/info.nib
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/objects.nib b/nb/ide.launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/objects.nib
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/objects.nib
rename to nb/ide.launcher/macosx/NetBeansLauncher/English.lproj/MainMenu.nib/objects.nib
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/NBExecutor.h b/nb/ide.launcher/macosx/NetBeansLauncher/NBExecutor.h
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/NBExecutor.h
rename to nb/ide.launcher/macosx/NetBeansLauncher/NBExecutor.h
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/NBExecutor.m b/nb/ide.launcher/macosx/NetBeansLauncher/NBExecutor.m
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/NBExecutor.m
rename to nb/ide.launcher/macosx/NetBeansLauncher/NBExecutor.m
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/NBPreferences.h b/nb/ide.launcher/macosx/NetBeansLauncher/NBPreferences.h
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/NBPreferences.h
rename to nb/ide.launcher/macosx/NetBeansLauncher/NBPreferences.h
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/NBPreferences.m b/nb/ide.launcher/macosx/NetBeansLauncher/NBPreferences.m
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/NBPreferences.m
rename to nb/ide.launcher/macosx/NetBeansLauncher/NBPreferences.m
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/NetBeansLauncher.pbproj/project.pbxproj b/nb/ide.launcher/macosx/NetBeansLauncher/NetBeansLauncher.pbproj/project.pbxproj
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/NetBeansLauncher.pbproj/project.pbxproj
rename to nb/ide.launcher/macosx/NetBeansLauncher/NetBeansLauncher.pbproj/project.pbxproj
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/ReadMe.rtf b/nb/ide.launcher/macosx/NetBeansLauncher/ReadMe.rtf
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/ReadMe.rtf
rename to nb/ide.launcher/macosx/NetBeansLauncher/ReadMe.rtf
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/main.m b/nb/ide.launcher/macosx/NetBeansLauncher/main.m
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/main.m
rename to nb/ide.launcher/macosx/NetBeansLauncher/main.m
diff --git a/ide.etc/launcher/macosx/NetBeansLauncher/netbeans.icns b/nb/ide.launcher/macosx/NetBeansLauncher/netbeans.icns
similarity index 100%
rename from ide.etc/launcher/macosx/NetBeansLauncher/netbeans.icns
rename to nb/ide.launcher/macosx/NetBeansLauncher/netbeans.icns
diff --git a/ide.etc/launcher/netbeans.clusters b/nb/ide.launcher/netbeans.clusters
similarity index 100%
rename from ide.etc/launcher/netbeans.clusters
rename to nb/ide.launcher/netbeans.clusters
diff --git a/ide.etc/launcher/netbeans.conf b/nb/ide.launcher/netbeans.conf
similarity index 100%
rename from ide.etc/launcher/netbeans.conf
rename to nb/ide.launcher/netbeans.conf
diff --git a/ide.etc/launcher/unix/netbeans b/nb/ide.launcher/unix/netbeans
similarity index 100%
rename from ide.etc/launcher/unix/netbeans
rename to nb/ide.launcher/unix/netbeans
diff --git a/ide.etc/launcher/windows/.dep.inc b/nb/ide.launcher/windows/.dep.inc
similarity index 100%
rename from ide.etc/launcher/windows/.dep.inc
rename to nb/ide.launcher/windows/.dep.inc
diff --git a/ide.etc/launcher/windows/Makefile b/nb/ide.launcher/windows/Makefile
similarity index 100%
rename from ide.etc/launcher/windows/Makefile
rename to nb/ide.launcher/windows/Makefile
diff --git a/ide.etc/launcher/windows/Makefile.migw b/nb/ide.launcher/windows/Makefile.migw
similarity index 100%
rename from ide.etc/launcher/windows/Makefile.migw
rename to nb/ide.launcher/windows/Makefile.migw
diff --git a/ide.etc/launcher/windows/cmdargs.h b/nb/ide.launcher/windows/cmdargs.h
similarity index 100%
rename from ide.etc/launcher/windows/cmdargs.h
rename to nb/ide.launcher/windows/cmdargs.h
diff --git a/ide.etc/launcher/windows/nblauncher.cpp b/nb/ide.launcher/windows/nblauncher.cpp
similarity index 100%
rename from ide.etc/launcher/windows/nblauncher.cpp
rename to nb/ide.launcher/windows/nblauncher.cpp
diff --git a/ide.etc/launcher/windows/nblauncher.h b/nb/ide.launcher/windows/nblauncher.h
similarity index 100%
rename from ide.etc/launcher/windows/nblauncher.h
rename to nb/ide.launcher/windows/nblauncher.h
diff --git a/ide.etc/launcher/windows/nbproject/configurations.xml b/nb/ide.launcher/windows/nbproject/configurations.xml
similarity index 100%
rename from ide.etc/launcher/windows/nbproject/configurations.xml
rename to nb/ide.launcher/windows/nbproject/configurations.xml
diff --git a/ide.etc/launcher/windows/nbproject/project.properties b/nb/ide.launcher/windows/nbproject/project.properties
similarity index 100%
rename from ide.etc/launcher/windows/nbproject/project.properties
rename to nb/ide.launcher/windows/nbproject/project.properties
diff --git a/ide.etc/launcher/windows/nbproject/project.xml b/nb/ide.launcher/windows/nbproject/project.xml
similarity index 100%
rename from ide.etc/launcher/windows/nbproject/project.xml
rename to nb/ide.launcher/windows/nbproject/project.xml
diff --git a/ide.etc/launcher/windows/netbeans.cpp b/nb/ide.launcher/windows/netbeans.cpp
similarity index 100%
rename from ide.etc/launcher/windows/netbeans.cpp
rename to nb/ide.launcher/windows/netbeans.cpp
diff --git a/ide.etc/launcher/windows/netbeans.exe.manifest b/nb/ide.launcher/windows/netbeans.exe.manifest
similarity index 100%
rename from ide.etc/launcher/windows/netbeans.exe.manifest
rename to nb/ide.launcher/windows/netbeans.exe.manifest
diff --git a/ide.etc/launcher/windows/netbeans.ico b/nb/ide.launcher/windows/netbeans.ico
similarity index 100%
rename from ide.etc/launcher/windows/netbeans.ico
rename to nb/ide.launcher/windows/netbeans.ico
diff --git a/ide.etc/launcher/windows/netbeans.rc b/nb/ide.launcher/windows/netbeans.rc
similarity index 100%
rename from ide.etc/launcher/windows/netbeans.rc
rename to nb/ide.launcher/windows/netbeans.rc
diff --git a/ide.etc/launcher/windows/netbeans64.exe.manifest b/nb/ide.launcher/windows/netbeans64.exe.manifest
similarity index 100%
rename from ide.etc/launcher/windows/netbeans64.exe.manifest
rename to nb/ide.launcher/windows/netbeans64.exe.manifest
diff --git a/ide.etc/launcher/windows/version.h b/nb/ide.launcher/windows/version.h
similarity index 100%
rename from ide.etc/launcher/windows/version.h
rename to nb/ide.launcher/windows/version.h
diff --git a/ide.etc/launcher/windows/version.rc b/nb/ide.launcher/windows/version.rc
similarity index 100%
rename from ide.etc/launcher/windows/version.rc
rename to nb/ide.launcher/windows/version.rc
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
index bc0b65d313..a5ade74a69 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-binaries
@@ -56,5 +56,5 @@ mobility.databindingme/lib/*
# TODO: should be removed eventually:
lib.terminalemulator/examples/lib.richexecution/process_start-*.zip
-# ide.etc is a special semi-module, does not have nbproject/project.xml, so is not recognized:
-ide.etc/external/launchers-9.0.zip
+# ide.launcher is a special semi-module, does not have nbproject/project.xml, so is not recognized:
+nb/ide.launcher/external/launchers-9.0.zip
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index c0bfe28203..bdd7359ea6 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -335,18 +335,18 @@
<loadproperties srcFile="${clusters.list.file}" />
<downloadbinaries cache="${binaries.cache}" server="${binaries.server}">
- <manifest dir="${nb_all}" includes="ide.etc/external/binaries-list"/>
+ <manifest dir="${nb_all}" includes="nb/ide.launcher/external/binaries-list"/>
</downloadbinaries>
<mkdir dir="${netbeans.dest.dir}/bin" />
- <copy file="../ide.etc/launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
+ <copy file="../nb/ide.launcher/unix/netbeans" todir="${netbeans.dest.dir}/bin" />
<chmod file="${netbeans.dest.dir}/bin/netbeans" perm="ugo+rx"/>
- <unzip src="../ide.etc/external/launchers-9.0.zip" dest="${netbeans.dest.dir}/bin" />
+ <unzip src="../nb/ide.launcher/external/launchers-9.0.zip" dest="${netbeans.dest.dir}/bin" />
<!-- if anybody knows better place for icons, let me know: jtulach@netbeans.org -->
<mkdir dir="${netbeans.dest.dir}/etc" />
- <copy file="../ide.etc/launcher/netbeans.conf" todir="${netbeans.dest.dir}/etc" overwrite="true"/>
- <copy file="../ide.etc/launcher/netbeans.clusters" todir="${netbeans.dest.dir}/etc" overwrite="true"/>
+ <copy file="../nb/ide.launcher/netbeans.conf" todir="${netbeans.dest.dir}/etc" overwrite="true"/>
+ <copy file="../nb/ide.launcher/netbeans.clusters" todir="${netbeans.dest.dir}/etc" overwrite="true"/>
<mkdir dir="${nb.build.dir}/license-temp" />
<concat destfile="${nb.build.dir}/license-temp/LICENSE.txt">
@@ -1577,7 +1577,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<resolve name="harness-modules" value="nb.cluster.harness"/>
<mkdir dir="${nb.build.dir}"/>
- <condition property="build.source.config.add.ide" else="" value=",ide.etc">
+ <condition property="build.source.config.add.ide" else="" value=",nb/ide.launcher">
<isset property="has.nb.cluster" />
</condition>
<dirset id="source.dirset" dir="${nb_all}"
diff --git a/nbbuild/rat-exclusions.txt b/nbbuild/rat-exclusions.txt
index f1548a05e9..606bc87ef4 100644
--- a/nbbuild/rat-exclusions.txt
+++ b/nbbuild/rat-exclusions.txt
@@ -128,7 +128,7 @@ websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/*.templa
**/*.nib
**/*.oql
**/*.ser
-ide.etc/launcher/macosx/NetBeansLauncher/ReadMe.rtf
+nb/ide.launcher/macosx/NetBeansLauncher/ReadMe.rtf
harness/jellytools.platform/src/org/netbeans/jellytools/version_info
###### generated test files
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists