1.1 --- a/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Utilities.java Wed Jun 22 00:14:13 2011 -0400
1.2 +++ b/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Utilities.java Wed Jun 22 10:11:09 2011 +0200
1.3 @@ -1010,7 +1010,12 @@
1.4 // XXX: it test can break simple modules mode
1.5 // should find corresponing UpdateElement and check its type
1.6 Object o = mi.getAttribute (ATTR_VISIBLE);
1.7 - return o == null || Boolean.parseBoolean (o.toString ());
1.8 + if (o != null) {
1.9 + return Boolean.parseBoolean(o.toString());
1.10 + }
1.11 + // OSGi bundles should be considered invisible by default since they are typically autoloads.
1.12 + // (NB modules get AutoUpdate-Show-In-Client inserted into the JAR by the build process.)
1.13 + return mi.getAttribute("Bundle-SymbolicName") == null;
1.14 }
1.15
1.16 public static boolean isEssentialModule (ModuleInfo mi) {
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/c.jcraft.jsch/build.xml Wed Jun 22 10:11:09 2011 +0200
2.3 @@ -0,0 +1,59 @@
2.4 +<?xml version="1.0" encoding="UTF-8"?>
2.5 +<!--
2.6 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2.7 +
2.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
2.9 +
2.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
2.11 +Other names may be trademarks of their respective owners.
2.12 +
2.13 +
2.14 +The contents of this file are subject to the terms of either the GNU
2.15 +General Public License Version 2 only ("GPL") or the Common
2.16 +Development and Distribution License("CDDL") (collectively, the
2.17 +"License"). You may not use this file except in compliance with the
2.18 +License. You can obtain a copy of the License at
2.19 +http://www.netbeans.org/cddl-gplv2.html
2.20 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
2.21 +specific language governing permissions and limitations under the
2.22 +License. When distributing the software, include this License Header
2.23 +Notice in each file and include the License file at
2.24 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
2.25 +particular file as subject to the "Classpath" exception as provided
2.26 +by Oracle in the GPL Version 2 section of the License file that
2.27 +accompanied this code. If applicable, add the following below the
2.28 +License Header, with the fields enclosed by brackets [] replaced by
2.29 +your own identifying information:
2.30 +"Portions Copyrighted [year] [name of copyright owner]"
2.31 +
2.32 +Contributor(s):
2.33 +
2.34 +The Original Software is NetBeans. The Initial Developer of the Original
2.35 +Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
2.36 +Microsystems, Inc. All Rights Reserved.
2.37 +
2.38 +If you wish your version of this file to be governed by only the CDDL
2.39 +or only the GPL Version 2, indicate your decision by adding
2.40 +"[Contributor] elects to include this software in this distribution
2.41 +under the [CDDL or GPL Version 2] license." If you do not indicate a
2.42 +single choice of license, a recipient has the option to distribute
2.43 +your version of this file under either the CDDL, the GPL Version 2 or
2.44 +to extend the choice of license to its licensees as provided above.
2.45 +However, if you add GPL Version 2 code and therefore, elected the GPL
2.46 +Version 2 license, then the option applies only if the new code is
2.47 +made subject to such option by the copyright holder.
2.48 +-->
2.49 +<project name="c.jcraft.jsch" default="netbeans" basedir=".">
2.50 + <import file="../nbbuild/templates/projectized.xml"/>
2.51 + <target name="jar">
2.52 + <jar jarfile="${cluster}/${module.jar}">
2.53 + <zipfileset src="external/jsch-0.1.44.jar"/>
2.54 + <manifest>
2.55 + <attribute name="Bundle-SymbolicName" value="com.jcraft.jsch"/>
2.56 + <attribute name="Bundle-Version" value="0.1.44"/>
2.57 + <attribute name="Export-Package" value="com.jcraft.jsch"/>
2.58 + <attribute name="Require-Bundle" value="com.jcraft.jzlib;resolution:=optional"/>
2.59 + </manifest>
2.60 + </jar>
2.61 + </target>
2.62 +</project>
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/c.jcraft.jsch/external/binaries-list Wed Jun 22 10:11:09 2011 +0200
3.3 @@ -0,0 +1,1 @@
3.4 +563D2C4728DA8351559154925B5903C259382C5B jsch-0.1.44.jar
3.5 \ No newline at end of file
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/c.jcraft.jsch/external/jsch-0.1.44-license.txt Wed Jun 22 10:11:09 2011 +0200
4.3 @@ -0,0 +1,33 @@
4.4 +Name: JSch
4.5 +Version: 0.1.44
4.6 +License: BSD-jsch-variant
4.7 +OSR: 3548
4.8 +Origin: http://www.jcraft.com/jsch/
4.9 +Description: Java implementation of SSH2
4.10 +
4.11 +Copyright (c) 2002-2010 Atsuhiko Yamanaka, JCraft,Inc.
4.12 +All rights reserved.
4.13 +
4.14 +Redistribution and use in source and binary forms, with or without
4.15 +modification, are permitted provided that the following conditions are met:
4.16 +
4.17 + 1. Redistributions of source code must retain the above copyright notice,
4.18 + this list of conditions and the following disclaimer.
4.19 +
4.20 + 2. Redistributions in binary form must reproduce the above copyright
4.21 + notice, this list of conditions and the following disclaimer in
4.22 + the documentation and/or other materials provided with the distribution.
4.23 +
4.24 + 3. The names of the authors may not be used to endorse or promote products
4.25 + derived from this software without specific prior written permission.
4.26 +
4.27 +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
4.28 +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
4.29 +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
4.30 +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
4.31 +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
4.32 +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
4.33 +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
4.34 +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
4.35 +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
4.36 +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4.37 \ No newline at end of file
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/c.jcraft.jsch/manifest.mf Wed Jun 22 10:11:09 2011 +0200
5.3 @@ -0,0 +1,3 @@
5.4 +Manifest-Version: 1.0
5.5 +OpenIDE-Module: com.jcraft.jsch
5.6 +
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/c.jcraft.jsch/nbproject/project.properties Wed Jun 22 10:11:09 2011 +0200
6.3 @@ -0,0 +1,46 @@
6.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
6.5 +#
6.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
6.7 +#
6.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
6.9 +# Other names may be trademarks of their respective owners.
6.10 +#
6.11 +# The contents of this file are subject to the terms of either the GNU
6.12 +# General Public License Version 2 only ("GPL") or the Common
6.13 +# Development and Distribution License("CDDL") (collectively, the
6.14 +# "License"). You may not use this file except in compliance with the
6.15 +# License. You can obtain a copy of the License at
6.16 +# http://www.netbeans.org/cddl-gplv2.html
6.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
6.18 +# specific language governing permissions and limitations under the
6.19 +# License. When distributing the software, include this License Header
6.20 +# Notice in each file and include the License file at
6.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
6.22 +# particular file as subject to the "Classpath" exception as provided
6.23 +# by Oracle in the GPL Version 2 section of the License file that
6.24 +# accompanied this code. If applicable, add the following below the
6.25 +# License Header, with the fields enclosed by brackets [] replaced by
6.26 +# your own identifying information:
6.27 +# "Portions Copyrighted [year] [name of copyright owner]"
6.28 +#
6.29 +# Contributor(s):
6.30 +#
6.31 +# The Original Software is NetBeans. The Initial Developer of the Original
6.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
6.33 +# Microsystems, Inc. All Rights Reserved.
6.34 +#
6.35 +# If you wish your version of this file to be governed by only the CDDL
6.36 +# or only the GPL Version 2, indicate your decision by adding
6.37 +# "[Contributor] elects to include this software in this distribution
6.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
6.39 +# single choice of license, a recipient has the option to distribute
6.40 +# your version of this file under either the CDDL, the GPL Version 2 or
6.41 +# to extend the choice of license to its licensees as provided above.
6.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
6.43 +# Version 2 license, then the option applies only if the new code is
6.44 +# made subject to such option by the copyright holder.
6.45 +
6.46 +is.autoload=true
6.47 +extra.license.files=external/jsch-0.1.44-license.txt
6.48 +sigtest.gen.fail.on.error=false
6.49 +
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/c.jcraft.jsch/nbproject/project.xml Wed Jun 22 10:11:09 2011 +0200
7.3 @@ -0,0 +1,65 @@
7.4 +<?xml version="1.0" encoding="UTF-8"?>
7.5 +<!--
7.6 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
7.7 +
7.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
7.9 +
7.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7.11 +Other names may be trademarks of their respective owners.
7.12 +
7.13 +
7.14 +The contents of this file are subject to the terms of either the GNU
7.15 +General Public License Version 2 only ("GPL") or the Common
7.16 +Development and Distribution License("CDDL") (collectively, the
7.17 +"License"). You may not use this file except in compliance with the
7.18 +License. You can obtain a copy of the License at
7.19 +http://www.netbeans.org/cddl-gplv2.html
7.20 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
7.21 +specific language governing permissions and limitations under the
7.22 +License. When distributing the software, include this License Header
7.23 +Notice in each file and include the License file at
7.24 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
7.25 +particular file as subject to the "Classpath" exception as provided
7.26 +by Oracle in the GPL Version 2 section of the License file that
7.27 +accompanied this code. If applicable, add the following below the
7.28 +License Header, with the fields enclosed by brackets [] replaced by
7.29 +your own identifying information:
7.30 +"Portions Copyrighted [year] [name of copyright owner]"
7.31 +
7.32 +Contributor(s):
7.33 +
7.34 +The Original Software is NetBeans. The Initial Developer of the Original
7.35 +Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
7.36 +Microsystems, Inc. All Rights Reserved.
7.37 +
7.38 +If you wish your version of this file to be governed by only the CDDL
7.39 +or only the GPL Version 2, indicate your decision by adding
7.40 +"[Contributor] elects to include this software in this distribution
7.41 +under the [CDDL or GPL Version 2] license." If you do not indicate a
7.42 +single choice of license, a recipient has the option to distribute
7.43 +your version of this file under either the CDDL, the GPL Version 2 or
7.44 +to extend the choice of license to its licensees as provided above.
7.45 +However, if you add GPL Version 2 code and therefore, elected the GPL
7.46 +Version 2 license, then the option applies only if the new code is
7.47 +made subject to such option by the copyright holder.
7.48 +-->
7.49 +<project xmlns="http://www.netbeans.org/ns/project/1">
7.50 + <type>org.netbeans.modules.apisupport.project</type>
7.51 + <configuration>
7.52 + <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
7.53 + <code-name-base>com.jcraft.jsch</code-name-base>
7.54 + <module-dependencies>
7.55 + <dependency>
7.56 + <code-name-base>com.jcraft.jzlib</code-name-base>
7.57 + <compile-dependency/>
7.58 + <run-dependency/>
7.59 + </dependency>
7.60 + </module-dependencies>
7.61 + <public-packages/>
7.62 + <class-path-extension>
7.63 + <runtime-relative-path>com-jcraft-jsch.jar</runtime-relative-path>
7.64 + <binary-origin>external/jsch-0.1.44.jar</binary-origin>
7.65 + </class-path-extension>
7.66 + </data>
7.67 + </configuration>
7.68 +</project>
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/c.jcraft.jzlib/build.xml Wed Jun 22 10:11:09 2011 +0200
8.3 @@ -0,0 +1,58 @@
8.4 +<?xml version="1.0" encoding="UTF-8"?>
8.5 +<!--
8.6 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
8.7 +
8.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
8.9 +
8.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
8.11 +Other names may be trademarks of their respective owners.
8.12 +
8.13 +
8.14 +The contents of this file are subject to the terms of either the GNU
8.15 +General Public License Version 2 only ("GPL") or the Common
8.16 +Development and Distribution License("CDDL") (collectively, the
8.17 +"License"). You may not use this file except in compliance with the
8.18 +License. You can obtain a copy of the License at
8.19 +http://www.netbeans.org/cddl-gplv2.html
8.20 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
8.21 +specific language governing permissions and limitations under the
8.22 +License. When distributing the software, include this License Header
8.23 +Notice in each file and include the License file at
8.24 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
8.25 +particular file as subject to the "Classpath" exception as provided
8.26 +by Oracle in the GPL Version 2 section of the License file that
8.27 +accompanied this code. If applicable, add the following below the
8.28 +License Header, with the fields enclosed by brackets [] replaced by
8.29 +your own identifying information:
8.30 +"Portions Copyrighted [year] [name of copyright owner]"
8.31 +
8.32 +Contributor(s):
8.33 +
8.34 +The Original Software is NetBeans. The Initial Developer of the Original
8.35 +Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
8.36 +Microsystems, Inc. All Rights Reserved.
8.37 +
8.38 +If you wish your version of this file to be governed by only the CDDL
8.39 +or only the GPL Version 2, indicate your decision by adding
8.40 +"[Contributor] elects to include this software in this distribution
8.41 +under the [CDDL or GPL Version 2] license." If you do not indicate a
8.42 +single choice of license, a recipient has the option to distribute
8.43 +your version of this file under either the CDDL, the GPL Version 2 or
8.44 +to extend the choice of license to its licensees as provided above.
8.45 +However, if you add GPL Version 2 code and therefore, elected the GPL
8.46 +Version 2 license, then the option applies only if the new code is
8.47 +made subject to such option by the copyright holder.
8.48 +-->
8.49 +<project name="c.jcraft.jzlib" default="netbeans" basedir=".">
8.50 + <import file="../nbbuild/templates/projectized.xml"/>
8.51 + <target name="jar">
8.52 + <jar jarfile="${cluster}/${module.jar}">
8.53 + <zipfileset src="external/jzlib-1.0.7.jar"/>
8.54 + <manifest>
8.55 + <attribute name="Bundle-SymbolicName" value="com.jcraft.jzlib"/>
8.56 + <attribute name="Bundle-Version" value="1.0.7"/>
8.57 + <attribute name="Export-Package" value="com.jcraft.jzlib"/>
8.58 + </manifest>
8.59 + </jar>
8.60 + </target>
8.61 +</project>
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/c.jcraft.jzlib/external/binaries-list Wed Jun 22 10:11:09 2011 +0200
9.3 @@ -0,0 +1,1 @@
9.4 +F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB jzlib-1.0.7.jar
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
10.2 +++ b/c.jcraft.jzlib/external/jzlib-1.0.7-license.txt Wed Jun 22 10:11:09 2011 +0200
10.3 @@ -0,0 +1,32 @@
10.4 +Name: JZlib
10.5 +Version: 1.0.7
10.6 +License: BSD-jzlib-variant
10.7 +OSR: 12659
10.8 +Origin: http://www.jcraft.com/jzlib/
10.9 +Description: Java implementation of zlib
10.10 +
10.11 +Copyright (c) 2000,2001,2002,2003,2004 ymnk, JCraft,Inc. All rights reserved.
10.12 +
10.13 +Redistribution and use in source and binary forms, with or without
10.14 +modification, are permitted provided that the following conditions are met:
10.15 +
10.16 + 1. Redistributions of source code must retain the above copyright notice,
10.17 + this list of conditions and the following disclaimer.
10.18 +
10.19 + 2. Redistributions in binary form must reproduce the above copyright
10.20 + notice, this list of conditions and the following disclaimer in
10.21 + the documentation and/or other materials provided with the distribution.
10.22 +
10.23 + 3. The names of the authors may not be used to endorse or promote products
10.24 + derived from this software without specific prior written permission.
10.25 +
10.26 +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
10.27 +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
10.28 +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
10.29 +INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
10.30 +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
10.31 +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
10.32 +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
10.33 +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
10.34 +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
10.35 +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
11.2 +++ b/c.jcraft.jzlib/manifest.mf Wed Jun 22 10:11:09 2011 +0200
11.3 @@ -0,0 +1,3 @@
11.4 +Manifest-Version: 1.0
11.5 +OpenIDE-Module: com.jcraft.jzlib
11.6 +
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
12.2 +++ b/c.jcraft.jzlib/nbproject/project.properties Wed Jun 22 10:11:09 2011 +0200
12.3 @@ -0,0 +1,46 @@
12.4 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
12.5 +#
12.6 +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
12.7 +#
12.8 +# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
12.9 +# Other names may be trademarks of their respective owners.
12.10 +#
12.11 +# The contents of this file are subject to the terms of either the GNU
12.12 +# General Public License Version 2 only ("GPL") or the Common
12.13 +# Development and Distribution License("CDDL") (collectively, the
12.14 +# "License"). You may not use this file except in compliance with the
12.15 +# License. You can obtain a copy of the License at
12.16 +# http://www.netbeans.org/cddl-gplv2.html
12.17 +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
12.18 +# specific language governing permissions and limitations under the
12.19 +# License. When distributing the software, include this License Header
12.20 +# Notice in each file and include the License file at
12.21 +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
12.22 +# particular file as subject to the "Classpath" exception as provided
12.23 +# by Oracle in the GPL Version 2 section of the License file that
12.24 +# accompanied this code. If applicable, add the following below the
12.25 +# License Header, with the fields enclosed by brackets [] replaced by
12.26 +# your own identifying information:
12.27 +# "Portions Copyrighted [year] [name of copyright owner]"
12.28 +#
12.29 +# Contributor(s):
12.30 +#
12.31 +# The Original Software is NetBeans. The Initial Developer of the Original
12.32 +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
12.33 +# Microsystems, Inc. All Rights Reserved.
12.34 +#
12.35 +# If you wish your version of this file to be governed by only the CDDL
12.36 +# or only the GPL Version 2, indicate your decision by adding
12.37 +# "[Contributor] elects to include this software in this distribution
12.38 +# under the [CDDL or GPL Version 2] license." If you do not indicate a
12.39 +# single choice of license, a recipient has the option to distribute
12.40 +# your version of this file under either the CDDL, the GPL Version 2 or
12.41 +# to extend the choice of license to its licensees as provided above.
12.42 +# However, if you add GPL Version 2 code and therefore, elected the GPL
12.43 +# Version 2 license, then the option applies only if the new code is
12.44 +# made subject to such option by the copyright holder.
12.45 +
12.46 +is.autoload=true
12.47 +extra.license.files=external/jzlib-1.0.7-license.txt
12.48 +spec.version.base=1.9.0
12.49 +sigtest.gen.fail.on.error=false
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
13.2 +++ b/c.jcraft.jzlib/nbproject/project.xml Wed Jun 22 10:11:09 2011 +0200
13.3 @@ -0,0 +1,59 @@
13.4 +<?xml version="1.0" encoding="UTF-8"?>
13.5 +<!--
13.6 +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
13.7 +
13.8 +Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
13.9 +
13.10 +Oracle and Java are registered trademarks of Oracle and/or its affiliates.
13.11 +Other names may be trademarks of their respective owners.
13.12 +
13.13 +
13.14 +The contents of this file are subject to the terms of either the GNU
13.15 +General Public License Version 2 only ("GPL") or the Common
13.16 +Development and Distribution License("CDDL") (collectively, the
13.17 +"License"). You may not use this file except in compliance with the
13.18 +License. You can obtain a copy of the License at
13.19 +http://www.netbeans.org/cddl-gplv2.html
13.20 +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13.21 +specific language governing permissions and limitations under the
13.22 +License. When distributing the software, include this License Header
13.23 +Notice in each file and include the License file at
13.24 +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
13.25 +particular file as subject to the "Classpath" exception as provided
13.26 +by Oracle in the GPL Version 2 section of the License file that
13.27 +accompanied this code. If applicable, add the following below the
13.28 +License Header, with the fields enclosed by brackets [] replaced by
13.29 +your own identifying information:
13.30 +"Portions Copyrighted [year] [name of copyright owner]"
13.31 +
13.32 +Contributor(s):
13.33 +
13.34 +The Original Software is NetBeans. The Initial Developer of the Original
13.35 +Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
13.36 +Microsystems, Inc. All Rights Reserved.
13.37 +
13.38 +If you wish your version of this file to be governed by only the CDDL
13.39 +or only the GPL Version 2, indicate your decision by adding
13.40 +"[Contributor] elects to include this software in this distribution
13.41 +under the [CDDL or GPL Version 2] license." If you do not indicate a
13.42 +single choice of license, a recipient has the option to distribute
13.43 +your version of this file under either the CDDL, the GPL Version 2 or
13.44 +to extend the choice of license to its licensees as provided above.
13.45 +However, if you add GPL Version 2 code and therefore, elected the GPL
13.46 +Version 2 license, then the option applies only if the new code is
13.47 +made subject to such option by the copyright holder.
13.48 +-->
13.49 +<project xmlns="http://www.netbeans.org/ns/project/1">
13.50 + <type>org.netbeans.modules.apisupport.project</type>
13.51 + <configuration>
13.52 + <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
13.53 + <code-name-base>com.jcraft.jzlib</code-name-base>
13.54 + <module-dependencies/>
13.55 + <public-packages/>
13.56 + <class-path-extension>
13.57 + <runtime-relative-path>com-jcraft-jzlib.jar</runtime-relative-path>
13.58 + <binary-origin>external/jzlib-1.0.7.jar</binary-origin>
13.59 + </class-path-extension>
13.60 + </data>
13.61 + </configuration>
13.62 +</project>
14.1 --- a/core.netigso/nbproject/project.xml Wed Jun 22 00:14:13 2011 -0400
14.2 +++ b/core.netigso/nbproject/project.xml Wed Jun 22 10:11:09 2011 +0200
14.3 @@ -121,6 +121,11 @@
14.4 <recursive/>
14.5 <compile-dependency/>
14.6 </test-dependency>
14.7 + <test-dependency>
14.8 + <code-name-base>org.openide.util</code-name-base>
14.9 + <compile-dependency/>
14.10 + <test/>
14.11 + </test-dependency>
14.12 </test-type>
14.13 </test-dependencies>
14.14 <public-packages>
15.1 --- a/core.netigso/src/org/netbeans/core/netigso/Netigso.java Wed Jun 22 00:14:13 2011 -0400
15.2 +++ b/core.netigso/src/org/netbeans/core/netigso/Netigso.java Wed Jun 22 10:11:09 2011 +0200
15.3 @@ -65,15 +65,18 @@
15.4 import org.netbeans.NetigsoFramework;
15.5 import org.netbeans.ProxyClassLoader;
15.6 import org.netbeans.Stamps;
15.7 +import org.netbeans.core.startup.Main;
15.8 import org.openide.modules.ModuleInfo;
15.9 import org.openide.util.Lookup;
15.10 import org.openide.util.lookup.ServiceProvider;
15.11 import org.openide.util.lookup.ServiceProviders;
15.12 import org.osgi.framework.Bundle;
15.13 import org.osgi.framework.BundleContext;
15.14 +import org.osgi.framework.BundleEvent;
15.15 import org.osgi.framework.BundleException;
15.16 import org.osgi.framework.Constants;
15.17 import org.osgi.framework.ServiceReference;
15.18 +import org.osgi.framework.Version;
15.19 import org.osgi.framework.launch.Framework;
15.20 import org.osgi.framework.launch.FrameworkFactory;
15.21 import org.osgi.service.packageadmin.PackageAdmin;
15.22 @@ -131,7 +134,7 @@
15.23 } catch (BundleException ex) {
15.24 LOG.log(Level.SEVERE, "Cannot start OSGi framework", ex); // NOI18N
15.25 }
15.26 - NetigsoServices ns = new NetigsoServices(framework);
15.27 + NetigsoServices ns = new NetigsoServices(this, framework);
15.28 LOG.finer("OSGi Container initialized"); // NOI18N
15.29 }
15.30 activator.register(preregister);
15.31 @@ -307,6 +310,28 @@
15.32 // take care about the registered bundles
15.33 //
15.34 private final Map<String,String[]> registered = new HashMap<String,String[]>();
15.35 +
15.36 + final void notifyBundleChange(final String symbolicName, final Version version, final int action) {
15.37 + Main.getModuleSystem().getManager().mutex().postReadRequest(new Runnable() {
15.38 + @Override
15.39 + public void run() {
15.40 + if (activator.isUnderOurControl(symbolicName)) {
15.41 + return;
15.42 + }
15.43 + String type = "" + action;
15.44 + switch (action) {
15.45 + case BundleEvent.INSTALLED: return; // no message for installed
15.46 + case BundleEvent.RESOLVED: type = "resolved"; break;
15.47 + case BundleEvent.STARTED: type = "started"; break;
15.48 + case BundleEvent.STOPPED: type = "stopped"; break;
15.49 + case BundleEvent.UNINSTALLED: return; // nothing for uninstalled
15.50 + }
15.51 + Netigso.LOG.log(Level.INFO, "bundle {0}@{2} {1}", new Object[]{
15.52 + symbolicName, type, version
15.53 + });
15.54 + }
15.55 + });
15.56 + }
15.57
15.58 private File getNetigsoCache() throws IllegalStateException {
15.59 // Explicitly specify the directory to use for caching bundles.
16.1 --- a/core.netigso/src/org/netbeans/core/netigso/NetigsoActivator.java Wed Jun 22 00:14:13 2011 -0400
16.2 +++ b/core.netigso/src/org/netbeans/core/netigso/NetigsoActivator.java Wed Jun 22 10:11:09 2011 +0200
16.3 @@ -86,6 +86,15 @@
16.4 all.addAll(m);
16.5 }
16.6
16.7 + boolean isUnderOurControl(String symbolicName) {
16.8 + for (ModuleInfo mi : all) {
16.9 + if (symbolicName.equals(mi.getCodeNameBase())) {
16.10 + return mi.isEnabled();
16.11 + }
16.12 + }
16.13 + return false;
16.14 + }
16.15 +
16.16 private static final class DelegateLoader extends ClassLoader {
16.17
16.18 private final ModuleInfo mi;
17.1 --- a/core.netigso/src/org/netbeans/core/netigso/NetigsoLoader.java Wed Jun 22 00:14:13 2011 -0400
17.2 +++ b/core.netigso/src/org/netbeans/core/netigso/NetigsoLoader.java Wed Jun 22 10:11:09 2011 +0200
17.3 @@ -4,8 +4,6 @@
17.4 import java.io.IOException;
17.5 import java.net.URL;
17.6 import java.util.Enumeration;
17.7 -import java.util.HashSet;
17.8 -import java.util.Set;
17.9 import java.util.logging.Level;
17.10 import java.util.logging.Logger;
17.11 import org.netbeans.ProxyClassLoader;
18.1 --- a/core.netigso/src/org/netbeans/core/netigso/NetigsoServices.java Wed Jun 22 00:14:13 2011 -0400
18.2 +++ b/core.netigso/src/org/netbeans/core/netigso/NetigsoServices.java Wed Jun 22 10:11:09 2011 +0200
18.3 @@ -46,6 +46,8 @@
18.4 import org.netbeans.core.startup.MainLookup;
18.5 import org.openide.util.lookup.InstanceContent;
18.6 import org.osgi.framework.Bundle;
18.7 +import org.osgi.framework.BundleEvent;
18.8 +import org.osgi.framework.BundleListener;
18.9 import org.osgi.framework.Constants;
18.10 import org.osgi.framework.ServiceEvent;
18.11 import org.osgi.framework.ServiceListener;
18.12 @@ -57,12 +59,16 @@
18.13 * @author Jaroslav Tulach <jtulach@netbeans.org>
18.14 */
18.15 final class NetigsoServices
18.16 -implements ServiceListener, InstanceContent.Convertor<ServiceReference, Object> {
18.17 - public NetigsoServices(Framework f) {
18.18 +implements BundleListener, ServiceListener, InstanceContent.Convertor<ServiceReference, Object> {
18.19 + private final Netigso netigso;
18.20 +
18.21 + NetigsoServices(Netigso netigso, Framework f) {
18.22 + this.netigso = netigso;
18.23 for (ServiceReference ref : f.getRegisteredServices()) {
18.24 MainLookup.register(ref, this);
18.25 }
18.26 f.getBundleContext().addServiceListener(this);
18.27 + f.getBundleContext().addBundleListener(this);
18.28 }
18.29
18.30 @Override
18.31 @@ -104,9 +110,18 @@
18.32 public String id(ServiceReference obj) {
18.33 return (String) obj.getProperty(Constants.SERVICE_ID);
18.34 }
18.35 -
18.36 +
18.37 @Override
18.38 public String displayName(ServiceReference obj) {
18.39 return (String) obj.getProperty(Constants.SERVICE_DESCRIPTION);
18.40 }
18.41 +
18.42 + @Override
18.43 + public void bundleChanged(BundleEvent be) {
18.44 + netigso.notifyBundleChange(
18.45 + be.getBundle().getSymbolicName(),
18.46 + be.getBundle().getVersion(),
18.47 + be.getType()
18.48 + );
18.49 + }
18.50 }
19.1 --- a/core.netigso/test/unit/src/org/netbeans/core/netigso/EnabledAutoloadTest.java Wed Jun 22 00:14:13 2011 -0400
19.2 +++ b/core.netigso/test/unit/src/org/netbeans/core/netigso/EnabledAutoloadTest.java Wed Jun 22 10:11:09 2011 +0200
19.3 @@ -45,6 +45,7 @@
19.4 package org.netbeans.core.netigso;
19.5
19.6 import java.io.File;
19.7 +import java.lang.reflect.Method;
19.8 import java.util.logging.Level;
19.9 import junit.framework.Test;
19.10 import org.netbeans.Module;
19.11 @@ -54,6 +55,10 @@
19.12 import org.netbeans.junit.Log;
19.13 import org.netbeans.junit.NbModuleSuite;
19.14 import org.netbeans.junit.NbTestCase;
19.15 +import org.openide.util.Lookup;
19.16 +import org.openide.util.test.TestFileUtils;
19.17 +import org.osgi.framework.Bundle;
19.18 +import org.osgi.framework.launch.Framework;
19.19
19.20 /**
19.21 *
19.22 @@ -83,6 +88,7 @@
19.23 jars.mkdirs();
19.24
19.25 j1 = SetupHid.createTestJAR(getDataDir(), jars, "simple-module.jar", null);
19.26 + System.setProperty("netbeans.user", getWorkDirPath());
19.27 }
19.28
19.29 public void testDependOnAutoload() throws Exception {
19.30 @@ -115,4 +121,68 @@
19.31 mgr.mutexPrivileged().exitWriteAccess();
19.32 }
19.33 }
19.34 +
19.35 + public void testAutoloadBundles() throws Exception {
19.36 + CharSequence log;
19.37 +
19.38 + ModuleManager mgr = Main.getModuleSystem().getManager();
19.39 + mgr.mutexPrivileged().enterWriteAccess();
19.40 + try {
19.41 + File jar1 = new File(getWorkDir(), "j1.jar");
19.42 + TestFileUtils.writeZipFile(jar1,
19.43 + "META-INF/MANIFEST.MF:Bundle-SymbolicName: m1\nExport-Package: m1\nBundle-Version: 1.0\n",
19.44 + "m1/res:ource");
19.45 + Module m1 = mgr.create(jar1, null, false, true, false);
19.46 + File jar2 = new File(getWorkDir(), "j2.jar");
19.47 + TestFileUtils.writeZipFile(jar2,
19.48 + "META-INF/MANIFEST.MF:Bundle-SymbolicName: m2\nExport-Package: m2\nBundle-Version: 1.0\nRequire-Bundle: m1\n",
19.49 + "m2/res:ource");
19.50 + Module m2 = mgr.create(jar2, null, false, true, false);
19.51 + File jar3 = new File(getWorkDir(), "j3.jar");
19.52 + TestFileUtils.writeZipFile(jar3,
19.53 + "META-INF/MANIFEST.MF:OpenIDE-Module: m3\nOpenIDE-Module-Module-Dependencies: m2\nOpenIDE-Module-Public-Packages: -\n");
19.54 + Module m3 = mgr.create(jar3, null, false, false, false);
19.55 +
19.56 + log = Log.enable("org.netbeans", Level.INFO);
19.57 + mgr.enable(m3);
19.58 + assertTrue(m3.isEnabled());
19.59 + assertTrue(m2.isEnabled());
19.60 + assertFalse("Module M1 is not enabled in ", m1.isEnabled());
19.61 + assertNotNull(m3.getClassLoader().getResource("m2/res"));
19.62 + assertNull("Can't load from not enabled bundle", m2.getClassLoader().getResource("m1/res"));
19.63 + assertNotNull("But can load directly from bundle", bundle(m1).getResource("m1/res"));
19.64 +
19.65 + } finally {
19.66 + mgr.mutexPrivileged().exitWriteAccess();
19.67 + }
19.68 + assertAsynchronousMessage(log, "bundle m1@1.0.0 resolved");
19.69 + if (log.toString().contains("bundle m2")) {
19.70 + fail("m2 is turned on as module and listed on its own");
19.71 + }
19.72 + }
19.73 +
19.74 + private void assertAsynchronousMessage(CharSequence log, String text) throws InterruptedException {
19.75 + for (int i = 0; i < 50; i++) {
19.76 + if (log.toString().contains(text)) {
19.77 + return;
19.78 + }
19.79 + Thread.sleep(100);
19.80 + }
19.81 + fail("There should be a message about enabling m1:\n" + log);
19.82 + }
19.83 +
19.84 + static Bundle bundle(Module module) throws Exception {
19.85 + final Netigso netigso = Lookup.getDefault().lookup(Netigso.class);
19.86 + Method m = Netigso.class.getDeclaredMethod("getFramework");
19.87 + m.setAccessible(true);
19.88 + Framework f = (Framework) m.invoke(netigso);
19.89 + for (Bundle b : f.getBundleContext().getBundles()) {
19.90 + if (b.getSymbolicName().equals(module.getCodeNameBase())) {
19.91 + return b;
19.92 + }
19.93 + }
19.94 + fail("no bundle found for " + module);
19.95 + return null;
19.96 + }
19.97 +
19.98 }
20.1 --- a/core.netigso/test/unit/src/org/netbeans/core/netigso/IntegrationTest.java Wed Jun 22 00:14:13 2011 -0400
20.2 +++ b/core.netigso/test/unit/src/org/netbeans/core/netigso/IntegrationTest.java Wed Jun 22 10:11:09 2011 +0200
20.3 @@ -101,21 +101,24 @@
20.4
20.5 public void testCheckWhichContainerIsRunning() throws Exception {
20.6 ModuleManager mgr = Main.getModuleSystem().getManager();
20.7 + Module m1;
20.8 mgr.mutexPrivileged().enterWriteAccess();
20.9 - Module m1;
20.10 - String mf = "Bundle-SymbolicName: org.foo\n" +
20.11 - "Bundle-Version: 1.1.0\n" +
20.12 - "Bundle-ManifestVersion: 2\n" +
20.13 - "Export-Package: org.foo";
20.14 + try {
20.15 + String mf = "Bundle-SymbolicName: org.foo\n" +
20.16 + "Bundle-Version: 1.1.0\n" +
20.17 + "Bundle-ManifestVersion: 2\n" +
20.18 + "Export-Package: org.foo";
20.19
20.20 - LOG.info("about to enable module org.foo");
20.21 - File jj1 = NetigsoHid.changeManifest(getWorkDir(), j1, mf);
20.22 - m1 = mgr.create(jj1, null, false, false, false);
20.23 - mgr.enable(m1);
20.24 - LOG.info("Enabling is over");
20.25 + LOG.info("about to enable module org.foo");
20.26 + File jj1 = NetigsoHid.changeManifest(getWorkDir(), j1, mf);
20.27 + m1 = mgr.create(jj1, null, false, false, false);
20.28 + mgr.enable(m1);
20.29 + LOG.info("Enabling is over");
20.30
20.31 - assertTrue("OSGi module is now enabled", m1.isEnabled());
20.32 - mgr.mutexPrivileged().exitWriteAccess();
20.33 + assertTrue("OSGi module is now enabled", m1.isEnabled());
20.34 + } finally {
20.35 + mgr.mutexPrivileged().exitWriteAccess();
20.36 + }
20.37
20.38 Object obj = Lookup.getDefault().lookup(NetigsoFramework.class);
20.39 LOG.log(Level.INFO, "NetigsoFramework: {0}", obj);
21.1 --- a/core.netigso/test/unit/src/org/netbeans/core/netigso/NetigsoSelfQueryTest.java Wed Jun 22 00:14:13 2011 -0400
21.2 +++ b/core.netigso/test/unit/src/org/netbeans/core/netigso/NetigsoSelfQueryTest.java Wed Jun 22 10:11:09 2011 +0200
21.3 @@ -386,12 +386,10 @@
21.4
21.5 @Override
21.6 public void addBundleListener(BundleListener bl) {
21.7 - throw new UnsupportedOperationException("Not supported yet.");
21.8 }
21.9
21.10 @Override
21.11 public void removeBundleListener(BundleListener bl) {
21.12 - throw new UnsupportedOperationException("Not supported yet.");
21.13 }
21.14
21.15 @Override
22.1 --- a/core.startup/src/org/netbeans/core/startup/ConsistencyVerifier.java Wed Jun 22 00:14:13 2011 -0400
22.2 +++ b/core.startup/src/org/netbeans/core/startup/ConsistencyVerifier.java Wed Jun 22 10:11:09 2011 +0200
22.3 @@ -54,6 +54,8 @@
22.4 import java.util.TreeSet;
22.5 import java.util.jar.Attributes;
22.6 import java.util.jar.Manifest;
22.7 +import java.util.regex.Matcher;
22.8 +import java.util.regex.Pattern;
22.9 import org.netbeans.Events;
22.10 import org.netbeans.InvalidException;
22.11 import org.netbeans.Module;
22.12 @@ -122,19 +124,34 @@
22.13 Set<Module> mods = new HashSet<Module>();
22.14 Set<Module> regularMods = new HashSet<Module>();
22.15 for (Manifest m : modules) {
22.16 + final Attributes man = m.getMainAttributes();
22.17 try {
22.18 - m.getMainAttributes().putValue("OpenIDE-Module-Public-Packages", "-"); // NOI18N
22.19 - m.getMainAttributes().remove(new Attributes.Name("OpenIDE-Module-Friends")); // NOI18N
22.20 - m.getMainAttributes().remove(new Attributes.Name("OpenIDE-Module-Localizing-Bundle")); // NOI18N
22.21 - boolean autoload = "true".equals(m.getMainAttributes().getValue("autoload"));
22.22 - boolean eager = "true".equals(m.getMainAttributes().getValue("eager"));
22.23 + man.putValue("OpenIDE-Module-Public-Packages", "-"); // NOI18N
22.24 + man.remove(new Attributes.Name("OpenIDE-Module-Friends")); // NOI18N
22.25 + man.remove(new Attributes.Name("OpenIDE-Module-Localizing-Bundle")); // NOI18N
22.26 + String bsn = man.getValue("Bundle-SymbolicName"); // NOI18N
22.27 + String ver = man.getValue("Bundle-Version"); // NOI18N
22.28 + if (bsn != null && ver != null) {
22.29 + if (man.getValue("OpenIDE-Module") == null) { // NOI18N
22.30 + man.putValue("OpenIDE-Module", bsn); // NOI18N
22.31 + }
22.32 + if (man.getValue("OpenIDE-Module-Specification-Version") == null) { // NOI18N
22.33 + Matcher match = Pattern.compile("[0-9]*(\\.[0-9]*)?(\\.[0-9]*)?").matcher(ver);
22.34 + if (match.find()) {
22.35 + ver = match.group();
22.36 + }
22.37 + man.putValue("OpenIDE-Module-Specification-Version", ver.replace("(.*)", "")); // NOI18N
22.38 + }
22.39 + }
22.40 + boolean autoload = "true".equals(man.getValue("autoload"));
22.41 + boolean eager = "true".equals(man.getValue("eager"));
22.42 Module mod = mgr.createFixed(m, null, ClassLoader.getSystemClassLoader(), autoload, eager);
22.43 mods.add(mod);
22.44 if (!autoload && !eager) {
22.45 regularMods.add(mod);
22.46 }
22.47 } catch (Exception x) {
22.48 - throw new IllegalArgumentException("Error parsing " + m.getMainAttributes().entrySet() + ": " + x, x);
22.49 + throw new IllegalArgumentException("Error parsing " + man.entrySet() + ": " + x, x);
22.50 }
22.51 }
22.52 SortedMap<String,SortedSet<String>> problems = new TreeMap<String,SortedSet<String>>();
23.1 --- a/dlight.nativeexecution/nbproject/project.xml Wed Jun 22 00:14:13 2011 -0400
23.2 +++ b/dlight.nativeexecution/nbproject/project.xml Wed Jun 22 10:11:09 2011 +0200
23.3 @@ -41,21 +41,11 @@
23.4 </run-dependency>
23.5 </dependency>
23.6 <dependency>
23.7 - <code-name-base>org.netbeans.libs.jsch</code-name-base>
23.8 + <code-name-base>com.jcraft.jsch</code-name-base>
23.9 <build-prerequisite/>
23.10 <compile-dependency/>
23.11 <run-dependency>
23.12 - <release-version>1</release-version>
23.13 - <specification-version>1.8</specification-version>
23.14 - </run-dependency>
23.15 - </dependency>
23.16 - <dependency>
23.17 - <code-name-base>org.netbeans.libs.jzlib</code-name-base>
23.18 - <build-prerequisite/>
23.19 - <compile-dependency/>
23.20 - <run-dependency>
23.21 - <release-version>1</release-version>
23.22 - <specification-version>1.0.7</specification-version>
23.23 + <specification-version>0.1.43</specification-version>
23.24 </run-dependency>
23.25 </dependency>
23.26 <dependency>
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
24.2 +++ b/ide.kit/module-auto-deps.xml Wed Jun 22 10:11:09 2011 +0200
24.3 @@ -0,0 +1,27 @@
24.4 +<?xml version="1.0" encoding="UTF-8"?>
24.5 +<!DOCTYPE transformations PUBLIC "-//NetBeans//DTD Module Automatic Dependencies 1.0//EN" "http://www.netbeans.org/dtds/module-auto-deps-1_0.dtd">
24.6 +<transformations version="1.0">
24.7 + <transformationgroup>
24.8 + <description>libs.jzlib and libs.jsch renamed</description>
24.9 + <transformation>
24.10 + <trigger-dependency type="cancel">
24.11 + <module-dependency codenamebase="org.netbeans.libs.jzlib"/>
24.12 + </trigger-dependency>
24.13 + <implies>
24.14 + <result>
24.15 + <module-dependency codenamebase="com.jcraft.jzlib" spec="1.0.7"/>
24.16 + </result>
24.17 + </implies>
24.18 + </transformation>
24.19 + <transformation>
24.20 + <trigger-dependency type="cancel">
24.21 + <module-dependency codenamebase="org.netbeans.libs.jsch"/>
24.22 + </trigger-dependency>
24.23 + <implies>
24.24 + <result>
24.25 + <module-dependency codenamebase="com.jcraft.jsch" spec="0.1.43"/>
24.26 + </result>
24.27 + </implies>
24.28 + </transformation>
24.29 + </transformationgroup>
24.30 +</transformations>
25.1 --- a/libs.git/external/binaries-list Wed Jun 22 00:14:13 2011 -0400
25.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
25.3 @@ -1,1 +0,0 @@
25.4 -A5812C58289110F2AD656BB6A5AA15C8839E5442 org.eclipse.jgit-1.0.0-rc3.jar
25.5 \ No newline at end of file
26.1 --- a/libs.git/nbproject/project.properties Wed Jun 22 00:14:13 2011 -0400
26.2 +++ b/libs.git/nbproject/project.properties Wed Jun 22 10:11:09 2011 +0200
26.3 @@ -47,5 +47,3 @@
26.4 nbm.homepage=http://netbeans.org/projects/versioncontrol/pages/Git_main
26.5 nbm.module.author=Ondrej Vrabec
26.6 sigtest.gen.fail.on.error=false
26.7 -
26.8 -release.external/org.eclipse.jgit-1.0.0-rc3.jar=modules/ext/org.eclipse.jgit-1.0.0-rc3.jar
27.1 --- a/libs.git/nbproject/project.xml Wed Jun 22 00:14:13 2011 -0400
27.2 +++ b/libs.git/nbproject/project.xml Wed Jun 22 10:11:09 2011 +0200
27.3 @@ -50,12 +50,17 @@
27.4 <code-name-base>org.netbeans.libs.git</code-name-base>
27.5 <module-dependencies>
27.6 <dependency>
27.7 - <code-name-base>org.netbeans.libs.jsch</code-name-base>
27.8 + <code-name-base>com.jcraft.jsch</code-name-base>
27.9 + <build-prerequisite/>
27.10 + <compile-dependency/>
27.11 + <run-dependency/>
27.12 + </dependency>
27.13 + <dependency>
27.14 + <code-name-base>org.eclipse.jgit</code-name-base>
27.15 <build-prerequisite/>
27.16 <compile-dependency/>
27.17 <run-dependency>
27.18 - <release-version>1</release-version>
27.19 - <specification-version>1.16</specification-version>
27.20 + <specification-version>1.0.0</specification-version>
27.21 </run-dependency>
27.22 </dependency>
27.23 <dependency>
27.24 @@ -96,10 +101,6 @@
27.25 <package>org.netbeans.libs.git.progress</package>
27.26 <package>org.netbeans.libs.git.utils</package>
27.27 </friend-packages>
27.28 - <class-path-extension>
27.29 - <runtime-relative-path>ext/org.eclipse.jgit-1.0.0-rc3.jar</runtime-relative-path>
27.30 - <binary-origin>external/org.eclipse.jgit-1.0.0-rc3.jar</binary-origin>
27.31 - </class-path-extension>
27.32 </data>
27.33 </configuration>
27.34 </project>
28.1 --- a/libs.jsch/build.xml Wed Jun 22 00:14:13 2011 -0400
28.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
28.3 @@ -1,48 +0,0 @@
28.4 -<?xml version="1.0" encoding="UTF-8"?>
28.5 -<!--
28.6 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
28.7 -
28.8 -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
28.9 -
28.10 -Oracle and Java are registered trademarks of Oracle and/or its affiliates.
28.11 -Other names may be trademarks of their respective owners.
28.12 -
28.13 -
28.14 -The contents of this file are subject to the terms of either the GNU
28.15 -General Public License Version 2 only ("GPL") or the Common
28.16 -Development and Distribution License("CDDL") (collectively, the
28.17 -"License"). You may not use this file except in compliance with the
28.18 -License. You can obtain a copy of the License at
28.19 -http://www.netbeans.org/cddl-gplv2.html
28.20 -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
28.21 -specific language governing permissions and limitations under the
28.22 -License. When distributing the software, include this License Header
28.23 -Notice in each file and include the License file at
28.24 -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
28.25 -particular file as subject to the "Classpath" exception as provided
28.26 -by Oracle in the GPL Version 2 section of the License file that
28.27 -accompanied this code. If applicable, add the following below the
28.28 -License Header, with the fields enclosed by brackets [] replaced by
28.29 -your own identifying information:
28.30 -"Portions Copyrighted [year] [name of copyright owner]"
28.31 -
28.32 -Contributor(s):
28.33 -
28.34 -The Original Software is NetBeans. The Initial Developer of the Original
28.35 -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
28.36 -Microsystems, Inc. All Rights Reserved.
28.37 -
28.38 -If you wish your version of this file to be governed by only the CDDL
28.39 -or only the GPL Version 2, indicate your decision by adding
28.40 -"[Contributor] elects to include this software in this distribution
28.41 -under the [CDDL or GPL Version 2] license." If you do not indicate a
28.42 -single choice of license, a recipient has the option to distribute
28.43 -your version of this file under either the CDDL, the GPL Version 2 or
28.44 -to extend the choice of license to its licensees as provided above.
28.45 -However, if you add GPL Version 2 code and therefore, elected the GPL
28.46 -Version 2 license, then the option applies only if the new code is
28.47 -made subject to such option by the copyright holder.
28.48 --->
28.49 -<project name="libs.jsch" default="netbeans" basedir=".">
28.50 - <import file="../nbbuild/templates/projectized.xml"/>
28.51 -</project>
29.1 --- a/libs.jsch/external/binaries-list Wed Jun 22 00:14:13 2011 -0400
29.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
29.3 @@ -1,1 +0,0 @@
29.4 -563D2C4728DA8351559154925B5903C259382C5B jsch-0.1.44.jar
29.5 \ No newline at end of file
30.1 --- a/libs.jsch/manifest.mf Wed Jun 22 00:14:13 2011 -0400
30.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
30.3 @@ -1,6 +0,0 @@
30.4 -Manifest-Version: 1.0
30.5 -OpenIDE-Module: org.netbeans.libs.jsch/1
30.6 -OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsch/Bundle.properties
30.7 -OpenIDE-Module-Layer: org/netbeans/libs/jsch/mf-layer.xml
30.8 -OpenIDE-Module-Specification-Version: 1.19
30.9 -
31.1 --- a/libs.jsch/nbproject/project.properties Wed Jun 22 00:14:13 2011 -0400
31.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
31.3 @@ -1,46 +0,0 @@
31.4 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
31.5 -#
31.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
31.7 -#
31.8 -# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
31.9 -# Other names may be trademarks of their respective owners.
31.10 -#
31.11 -# The contents of this file are subject to the terms of either the GNU
31.12 -# General Public License Version 2 only ("GPL") or the Common
31.13 -# Development and Distribution License("CDDL") (collectively, the
31.14 -# "License"). You may not use this file except in compliance with the
31.15 -# License. You can obtain a copy of the License at
31.16 -# http://www.netbeans.org/cddl-gplv2.html
31.17 -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
31.18 -# specific language governing permissions and limitations under the
31.19 -# License. When distributing the software, include this License Header
31.20 -# Notice in each file and include the License file at
31.21 -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
31.22 -# particular file as subject to the "Classpath" exception as provided
31.23 -# by Oracle in the GPL Version 2 section of the License file that
31.24 -# accompanied this code. If applicable, add the following below the
31.25 -# License Header, with the fields enclosed by brackets [] replaced by
31.26 -# your own identifying information:
31.27 -# "Portions Copyrighted [year] [name of copyright owner]"
31.28 -#
31.29 -# Contributor(s):
31.30 -#
31.31 -# The Original Software is NetBeans. The Initial Developer of the Original
31.32 -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
31.33 -# Microsystems, Inc. All Rights Reserved.
31.34 -#
31.35 -# If you wish your version of this file to be governed by only the CDDL
31.36 -# or only the GPL Version 2, indicate your decision by adding
31.37 -# "[Contributor] elects to include this software in this distribution
31.38 -# under the [CDDL or GPL Version 2] license." If you do not indicate a
31.39 -# single choice of license, a recipient has the option to distribute
31.40 -# your version of this file under either the CDDL, the GPL Version 2 or
31.41 -# to extend the choice of license to its licensees as provided above.
31.42 -# However, if you add GPL Version 2 code and therefore, elected the GPL
31.43 -# Version 2 license, then the option applies only if the new code is
31.44 -# made subject to such option by the copyright holder.
31.45 -
31.46 -is.autoload=true
31.47 -release.external/jsch-0.1.44.jar=modules/ext/jsch-0.1.44.jar
31.48 -sigtest.gen.fail.on.error=false
31.49 -
32.1 --- a/libs.jsch/nbproject/project.xml Wed Jun 22 00:14:13 2011 -0400
32.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
32.3 @@ -1,79 +0,0 @@
32.4 -<?xml version="1.0" encoding="UTF-8"?>
32.5 -<!--
32.6 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
32.7 -
32.8 -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
32.9 -
32.10 -Oracle and Java are registered trademarks of Oracle and/or its affiliates.
32.11 -Other names may be trademarks of their respective owners.
32.12 -
32.13 -
32.14 -The contents of this file are subject to the terms of either the GNU
32.15 -General Public License Version 2 only ("GPL") or the Common
32.16 -Development and Distribution License("CDDL") (collectively, the
32.17 -"License"). You may not use this file except in compliance with the
32.18 -License. You can obtain a copy of the License at
32.19 -http://www.netbeans.org/cddl-gplv2.html
32.20 -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
32.21 -specific language governing permissions and limitations under the
32.22 -License. When distributing the software, include this License Header
32.23 -Notice in each file and include the License file at
32.24 -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
32.25 -particular file as subject to the "Classpath" exception as provided
32.26 -by Oracle in the GPL Version 2 section of the License file that
32.27 -accompanied this code. If applicable, add the following below the
32.28 -License Header, with the fields enclosed by brackets [] replaced by
32.29 -your own identifying information:
32.30 -"Portions Copyrighted [year] [name of copyright owner]"
32.31 -
32.32 -Contributor(s):
32.33 -
32.34 -The Original Software is NetBeans. The Initial Developer of the Original
32.35 -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
32.36 -Microsystems, Inc. All Rights Reserved.
32.37 -
32.38 -If you wish your version of this file to be governed by only the CDDL
32.39 -or only the GPL Version 2, indicate your decision by adding
32.40 -"[Contributor] elects to include this software in this distribution
32.41 -under the [CDDL or GPL Version 2] license." If you do not indicate a
32.42 -single choice of license, a recipient has the option to distribute
32.43 -your version of this file under either the CDDL, the GPL Version 2 or
32.44 -to extend the choice of license to its licensees as provided above.
32.45 -However, if you add GPL Version 2 code and therefore, elected the GPL
32.46 -Version 2 license, then the option applies only if the new code is
32.47 -made subject to such option by the copyright holder.
32.48 --->
32.49 -<project xmlns="http://www.netbeans.org/ns/project/1">
32.50 - <type>org.netbeans.modules.apisupport.project</type>
32.51 - <configuration>
32.52 - <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
32.53 - <code-name-base>org.netbeans.libs.jsch</code-name-base>
32.54 - <module-dependencies>
32.55 - <dependency>
32.56 - <code-name-base>org.netbeans.libs.jzlib</code-name-base>
32.57 - <build-prerequisite/>
32.58 - <compile-dependency/>
32.59 - <run-dependency>
32.60 - <release-version>1</release-version>
32.61 - <specification-version>1.0.7</specification-version>
32.62 - </run-dependency>
32.63 - </dependency>
32.64 - <dependency>
32.65 - <code-name-base>org.openide.modules</code-name-base>
32.66 - <build-prerequisite/>
32.67 - <compile-dependency/>
32.68 - <run-dependency>
32.69 - <specification-version>6.0</specification-version>
32.70 - </run-dependency>
32.71 - </dependency>
32.72 - </module-dependencies>
32.73 - <public-packages>
32.74 - <package>com.jcraft.jsch</package>
32.75 - </public-packages>
32.76 - <class-path-extension>
32.77 - <runtime-relative-path>ext/jsch-0.1.44.jar</runtime-relative-path>
32.78 - <binary-origin>external/jsch-0.1.44.jar</binary-origin>
32.79 - </class-path-extension>
32.80 - </data>
32.81 - </configuration>
32.82 -</project>
33.1 --- a/libs.jsch/src/org/netbeans/libs/jsch/Bundle.properties Wed Jun 22 00:14:13 2011 -0400
33.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
33.3 @@ -1,47 +0,0 @@
33.4 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
33.5 -#
33.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
33.7 -#
33.8 -# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
33.9 -# Other names may be trademarks of their respective owners.
33.10 -#
33.11 -# The contents of this file are subject to the terms of either the GNU
33.12 -# General Public License Version 2 only ("GPL") or the Common
33.13 -# Development and Distribution License("CDDL") (collectively, the
33.14 -# "License"). You may not use this file except in compliance with the
33.15 -# License. You can obtain a copy of the License at
33.16 -# http://www.netbeans.org/cddl-gplv2.html
33.17 -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
33.18 -# specific language governing permissions and limitations under the
33.19 -# License. When distributing the software, include this License Header
33.20 -# Notice in each file and include the License file at
33.21 -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
33.22 -# particular file as subject to the "Classpath" exception as provided
33.23 -# by Oracle in the GPL Version 2 section of the License file that
33.24 -# accompanied this code. If applicable, add the following below the
33.25 -# License Header, with the fields enclosed by brackets [] replaced by
33.26 -# your own identifying information:
33.27 -# "Portions Copyrighted [year] [name of copyright owner]"
33.28 -#
33.29 -# Contributor(s):
33.30 -#
33.31 -# The Original Software is NetBeans. The Initial Developer of the Original
33.32 -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
33.33 -# Microsystems, Inc. All Rights Reserved.
33.34 -#
33.35 -# If you wish your version of this file to be governed by only the CDDL
33.36 -# or only the GPL Version 2, indicate your decision by adding
33.37 -# "[Contributor] elects to include this software in this distribution
33.38 -# under the [CDDL or GPL Version 2] license." If you do not indicate a
33.39 -# single choice of license, a recipient has the option to distribute
33.40 -# your version of this file under either the CDDL, the GPL Version 2 or
33.41 -# to extend the choice of license to its licensees as provided above.
33.42 -# However, if you add GPL Version 2 code and therefore, elected the GPL
33.43 -# Version 2 license, then the option applies only if the new code is
33.44 -# made subject to such option by the copyright holder.
33.45 -
33.46 -## libs/jsch/manifest.mf
33.47 -OpenIDE-Module-Name=Java Secure Channel integration
33.48 -OpenIDE-Module-Display-Category=Libraries
33.49 -OpenIDE-Module-Short-Description=Bundles JSch (SSH implementation).
33.50 -OpenIDE-Module-Long-Description=This module bundles Java Secure Channel (an SSH implementation).
34.1 --- a/libs.jsch/src/org/netbeans/libs/jsch/mf-layer.xml Wed Jun 22 00:14:13 2011 -0400
34.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
34.3 @@ -1,58 +0,0 @@
34.4 -<?xml version="1.0" encoding="UTF-8"?>
34.5 -<!--
34.6 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
34.7 -
34.8 -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
34.9 -
34.10 -Oracle and Java are registered trademarks of Oracle and/or its affiliates.
34.11 -Other names may be trademarks of their respective owners.
34.12 -
34.13 -
34.14 -The contents of this file are subject to the terms of either the GNU
34.15 -General Public License Version 2 only ("GPL") or the Common
34.16 -Development and Distribution License("CDDL") (collectively, the
34.17 -"License"). You may not use this file except in compliance with the
34.18 -License. You can obtain a copy of the License at
34.19 -http://www.netbeans.org/cddl-gplv2.html
34.20 -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
34.21 -specific language governing permissions and limitations under the
34.22 -License. When distributing the software, include this License Header
34.23 -Notice in each file and include the License file at
34.24 -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
34.25 -particular file as subject to the "Classpath" exception as provided
34.26 -by Oracle in the GPL Version 2 section of the License file that
34.27 -accompanied this code. If applicable, add the following below the
34.28 -License Header, with the fields enclosed by brackets [] replaced by
34.29 -your own identifying information:
34.30 -"Portions Copyrighted [year] [name of copyright owner]"
34.31 -
34.32 -Contributor(s):
34.33 -
34.34 -The Original Software is NetBeans. The Initial Developer of the Original
34.35 -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
34.36 -Microsystems, Inc. All Rights Reserved.
34.37 -
34.38 -If you wish your version of this file to be governed by only the CDDL
34.39 -or only the GPL Version 2, indicate your decision by adding
34.40 -"[Contributor] elects to include this software in this distribution
34.41 -under the [CDDL or GPL Version 2] license." If you do not indicate a
34.42 -single choice of license, a recipient has the option to distribute
34.43 -your version of this file under either the CDDL, the GPL Version 2 or
34.44 -to extend the choice of license to its licensees as provided above.
34.45 -However, if you add GPL Version 2 code and therefore, elected the GPL
34.46 -Version 2 license, then the option applies only if the new code is
34.47 -made subject to such option by the copyright holder.
34.48 --->
34.49 -<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
34.50 -
34.51 -<filesystem>
34.52 - <folder name="Services">
34.53 - <folder name="Hidden">
34.54 - <file name="org-netbeans-lib-jsch-antlibrary.instance">
34.55 - <attr name="instanceCreate" methodvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspath.url"/>
34.56 - <attr name="instanceOf" stringvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspathProvider"/>
34.57 - <attr name="url" urlvalue="nbinst://org.netbeans.libs.jsch/modules/ext/jsch-0.1.44.jar"/>
34.58 - </file>
34.59 - </folder>
34.60 - </folder>
34.61 -</filesystem>
35.1 --- a/libs.jzlib/build.xml Wed Jun 22 00:14:13 2011 -0400
35.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
35.3 @@ -1,48 +0,0 @@
35.4 -<?xml version="1.0" encoding="UTF-8"?>
35.5 -<!--
35.6 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
35.7 -
35.8 -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
35.9 -
35.10 -Oracle and Java are registered trademarks of Oracle and/or its affiliates.
35.11 -Other names may be trademarks of their respective owners.
35.12 -
35.13 -
35.14 -The contents of this file are subject to the terms of either the GNU
35.15 -General Public License Version 2 only ("GPL") or the Common
35.16 -Development and Distribution License("CDDL") (collectively, the
35.17 -"License"). You may not use this file except in compliance with the
35.18 -License. You can obtain a copy of the License at
35.19 -http://www.netbeans.org/cddl-gplv2.html
35.20 -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
35.21 -specific language governing permissions and limitations under the
35.22 -License. When distributing the software, include this License Header
35.23 -Notice in each file and include the License file at
35.24 -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
35.25 -particular file as subject to the "Classpath" exception as provided
35.26 -by Oracle in the GPL Version 2 section of the License file that
35.27 -accompanied this code. If applicable, add the following below the
35.28 -License Header, with the fields enclosed by brackets [] replaced by
35.29 -your own identifying information:
35.30 -"Portions Copyrighted [year] [name of copyright owner]"
35.31 -
35.32 -Contributor(s):
35.33 -
35.34 -The Original Software is NetBeans. The Initial Developer of the Original
35.35 -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
35.36 -Microsystems, Inc. All Rights Reserved.
35.37 -
35.38 -If you wish your version of this file to be governed by only the CDDL
35.39 -or only the GPL Version 2, indicate your decision by adding
35.40 -"[Contributor] elects to include this software in this distribution
35.41 -under the [CDDL or GPL Version 2] license." If you do not indicate a
35.42 -single choice of license, a recipient has the option to distribute
35.43 -your version of this file under either the CDDL, the GPL Version 2 or
35.44 -to extend the choice of license to its licensees as provided above.
35.45 -However, if you add GPL Version 2 code and therefore, elected the GPL
35.46 -Version 2 license, then the option applies only if the new code is
35.47 -made subject to such option by the copyright holder.
35.48 --->
35.49 -<project name="libs.jzlib" default="netbeans" basedir=".">
35.50 - <import file="../nbbuild/templates/projectized.xml"/>
35.51 -</project>
36.1 --- a/libs.jzlib/external/binaries-list Wed Jun 22 00:14:13 2011 -0400
36.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
36.3 @@ -1,1 +0,0 @@
36.4 -F406B7784A0DA5C4670B038BF55A4DCD4AF30AEB jzlib-1.0.7.jar
37.1 --- a/libs.jzlib/external/jzlib-1.0.7-license.txt Wed Jun 22 00:14:13 2011 -0400
37.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
37.3 @@ -1,32 +0,0 @@
37.4 -Name: JZlib
37.5 -Version: 1.0.7
37.6 -License: BSD-jzlib-variant
37.7 -OSR: 12659
37.8 -Origin: http://www.jcraft.com/jzlib/
37.9 -Description: Java implementation of zlib
37.10 -
37.11 -Copyright (c) 2000,2001,2002,2003,2004 ymnk, JCraft,Inc. All rights reserved.
37.12 -
37.13 -Redistribution and use in source and binary forms, with or without
37.14 -modification, are permitted provided that the following conditions are met:
37.15 -
37.16 - 1. Redistributions of source code must retain the above copyright notice,
37.17 - this list of conditions and the following disclaimer.
37.18 -
37.19 - 2. Redistributions in binary form must reproduce the above copyright
37.20 - notice, this list of conditions and the following disclaimer in
37.21 - the documentation and/or other materials provided with the distribution.
37.22 -
37.23 - 3. The names of the authors may not be used to endorse or promote products
37.24 - derived from this software without specific prior written permission.
37.25 -
37.26 -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
37.27 -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
37.28 -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
37.29 -INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
37.30 -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
37.31 -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
37.32 -OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
37.33 -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
37.34 -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
37.35 -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
38.1 --- a/libs.jzlib/manifest.mf Wed Jun 22 00:14:13 2011 -0400
38.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
38.3 @@ -1,4 +0,0 @@
38.4 -Manifest-Version: 1.0
38.5 -OpenIDE-Module: org.netbeans.libs.jzlib/1
38.6 -OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jzlib/Bundle.properties
38.7 -OpenIDE-Module-Implementation-Version: 107
39.1 --- a/libs.jzlib/nbproject/project.properties Wed Jun 22 00:14:13 2011 -0400
39.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
39.3 @@ -1,46 +0,0 @@
39.4 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
39.5 -#
39.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
39.7 -#
39.8 -# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
39.9 -# Other names may be trademarks of their respective owners.
39.10 -#
39.11 -# The contents of this file are subject to the terms of either the GNU
39.12 -# General Public License Version 2 only ("GPL") or the Common
39.13 -# Development and Distribution License("CDDL") (collectively, the
39.14 -# "License"). You may not use this file except in compliance with the
39.15 -# License. You can obtain a copy of the License at
39.16 -# http://www.netbeans.org/cddl-gplv2.html
39.17 -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
39.18 -# specific language governing permissions and limitations under the
39.19 -# License. When distributing the software, include this License Header
39.20 -# Notice in each file and include the License file at
39.21 -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
39.22 -# particular file as subject to the "Classpath" exception as provided
39.23 -# by Oracle in the GPL Version 2 section of the License file that
39.24 -# accompanied this code. If applicable, add the following below the
39.25 -# License Header, with the fields enclosed by brackets [] replaced by
39.26 -# your own identifying information:
39.27 -# "Portions Copyrighted [year] [name of copyright owner]"
39.28 -#
39.29 -# Contributor(s):
39.30 -#
39.31 -# The Original Software is NetBeans. The Initial Developer of the Original
39.32 -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
39.33 -# Microsystems, Inc. All Rights Reserved.
39.34 -#
39.35 -# If you wish your version of this file to be governed by only the CDDL
39.36 -# or only the GPL Version 2, indicate your decision by adding
39.37 -# "[Contributor] elects to include this software in this distribution
39.38 -# under the [CDDL or GPL Version 2] license." If you do not indicate a
39.39 -# single choice of license, a recipient has the option to distribute
39.40 -# your version of this file under either the CDDL, the GPL Version 2 or
39.41 -# to extend the choice of license to its licensees as provided above.
39.42 -# However, if you add GPL Version 2 code and therefore, elected the GPL
39.43 -# Version 2 license, then the option applies only if the new code is
39.44 -# made subject to such option by the copyright holder.
39.45 -
39.46 -is.autoload=true
39.47 -release.external/jzlib-1.0.7.jar=modules/ext/jzlib-1.0.7.jar
39.48 -spec.version.base=1.9.0
39.49 -sigtest.gen.fail.on.error=false
40.1 --- a/libs.jzlib/nbproject/project.xml Wed Jun 22 00:14:13 2011 -0400
40.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
40.3 @@ -1,70 +0,0 @@
40.4 -<?xml version="1.0" encoding="UTF-8"?>
40.5 -<!--
40.6 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
40.7 -
40.8 -Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
40.9 -
40.10 -Oracle and Java are registered trademarks of Oracle and/or its affiliates.
40.11 -Other names may be trademarks of their respective owners.
40.12 -
40.13 -
40.14 -The contents of this file are subject to the terms of either the GNU
40.15 -General Public License Version 2 only ("GPL") or the Common
40.16 -Development and Distribution License("CDDL") (collectively, the
40.17 -"License"). You may not use this file except in compliance with the
40.18 -License. You can obtain a copy of the License at
40.19 -http://www.netbeans.org/cddl-gplv2.html
40.20 -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
40.21 -specific language governing permissions and limitations under the
40.22 -License. When distributing the software, include this License Header
40.23 -Notice in each file and include the License file at
40.24 -nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
40.25 -particular file as subject to the "Classpath" exception as provided
40.26 -by Oracle in the GPL Version 2 section of the License file that
40.27 -accompanied this code. If applicable, add the following below the
40.28 -License Header, with the fields enclosed by brackets [] replaced by
40.29 -your own identifying information:
40.30 -"Portions Copyrighted [year] [name of copyright owner]"
40.31 -
40.32 -Contributor(s):
40.33 -
40.34 -The Original Software is NetBeans. The Initial Developer of the Original
40.35 -Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
40.36 -Microsystems, Inc. All Rights Reserved.
40.37 -
40.38 -If you wish your version of this file to be governed by only the CDDL
40.39 -or only the GPL Version 2, indicate your decision by adding
40.40 -"[Contributor] elects to include this software in this distribution
40.41 -under the [CDDL or GPL Version 2] license." If you do not indicate a
40.42 -single choice of license, a recipient has the option to distribute
40.43 -your version of this file under either the CDDL, the GPL Version 2 or
40.44 -to extend the choice of license to its licensees as provided above.
40.45 -However, if you add GPL Version 2 code and therefore, elected the GPL
40.46 -Version 2 license, then the option applies only if the new code is
40.47 -made subject to such option by the copyright holder.
40.48 --->
40.49 -<project xmlns="http://www.netbeans.org/ns/project/1">
40.50 - <type>org.netbeans.modules.apisupport.project</type>
40.51 - <configuration>
40.52 - <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
40.53 - <code-name-base>org.netbeans.libs.jzlib</code-name-base>
40.54 - <module-dependencies>
40.55 - <dependency>
40.56 - <code-name-base>org.openide.modules</code-name-base>
40.57 - <build-prerequisite/>
40.58 - <compile-dependency/>
40.59 - <run-dependency>
40.60 - <specification-version>6.0</specification-version>
40.61 - </run-dependency>
40.62 - </dependency>
40.63 - </module-dependencies>
40.64 - <public-packages>
40.65 - <package>com.jcraft.jzlib</package>
40.66 - </public-packages>
40.67 - <class-path-extension>
40.68 - <runtime-relative-path>ext/jzlib-1.0.7.jar</runtime-relative-path>
40.69 - <binary-origin>external/jzlib-1.0.7.jar</binary-origin>
40.70 - </class-path-extension>
40.71 - </data>
40.72 - </configuration>
40.73 -</project>
41.1 --- a/libs.jzlib/src/org/netbeans/libs/jzlib/Bundle.properties Wed Jun 22 00:14:13 2011 -0400
41.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
41.3 @@ -1,46 +0,0 @@
41.4 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
41.5 -#
41.6 -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
41.7 -#
41.8 -# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
41.9 -# Other names may be trademarks of their respective owners.
41.10 -#
41.11 -# The contents of this file are subject to the terms of either the GNU
41.12 -# General Public License Version 2 only ("GPL") or the Common
41.13 -# Development and Distribution License("CDDL") (collectively, the
41.14 -# "License"). You may not use this file except in compliance with the
41.15 -# License. You can obtain a copy of the License at
41.16 -# http://www.netbeans.org/cddl-gplv2.html
41.17 -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
41.18 -# specific language governing permissions and limitations under the
41.19 -# License. When distributing the software, include this License Header
41.20 -# Notice in each file and include the License file at
41.21 -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
41.22 -# particular file as subject to the "Classpath" exception as provided
41.23 -# by Oracle in the GPL Version 2 section of the License file that
41.24 -# accompanied this code. If applicable, add the following below the
41.25 -# License Header, with the fields enclosed by brackets [] replaced by
41.26 -# your own identifying information:
41.27 -# "Portions Copyrighted [year] [name of copyright owner]"
41.28 -#
41.29 -# Contributor(s):
41.30 -#
41.31 -# The Original Software is NetBeans. The Initial Developer of the Original
41.32 -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
41.33 -# Microsystems, Inc. All Rights Reserved.
41.34 -#
41.35 -# If you wish your version of this file to be governed by only the CDDL
41.36 -# or only the GPL Version 2, indicate your decision by adding
41.37 -# "[Contributor] elects to include this software in this distribution
41.38 -# under the [CDDL or GPL Version 2] license." If you do not indicate a
41.39 -# single choice of license, a recipient has the option to distribute
41.40 -# your version of this file under either the CDDL, the GPL Version 2 or
41.41 -# to extend the choice of license to its licensees as provided above.
41.42 -# However, if you add GPL Version 2 code and therefore, elected the GPL
41.43 -# Version 2 license, then the option applies only if the new code is
41.44 -# made subject to such option by the copyright holder.
41.45 -
41.46 -OpenIDE-Module-Name=Java zlib integration
41.47 -OpenIDE-Module-Display-Category=Libraries
41.48 -OpenIDE-Module-Short-Description=Bundles JZLib (Java zlib implementation).
41.49 -OpenIDE-Module-Long-Description=This module bundles Java zlib implementation.
42.1 --- a/mobility.deployment.ftpscp/nbproject/project.xml Wed Jun 22 00:14:13 2011 -0400
42.2 +++ b/mobility.deployment.ftpscp/nbproject/project.xml Wed Jun 22 10:11:09 2011 +0200
42.3 @@ -85,12 +85,11 @@
42.4 </run-dependency>
42.5 </dependency>
42.6 <dependency>
42.7 - <code-name-base>org.netbeans.libs.jsch</code-name-base>
42.8 + <code-name-base>com.jcraft.jsch</code-name-base>
42.9 <build-prerequisite/>
42.10 <compile-dependency/>
42.11 <run-dependency>
42.12 - <release-version>1</release-version>
42.13 - <specification-version>1.1</specification-version>
42.14 + <specification-version>0.1.43</specification-version>
42.15 </run-dependency>
42.16 </dependency>
42.17 <dependency>
43.1 --- a/mobility.deployment.ricoh/nbproject/project.xml Wed Jun 22 00:14:13 2011 -0400
43.2 +++ b/mobility.deployment.ricoh/nbproject/project.xml Wed Jun 22 10:11:09 2011 +0200
43.3 @@ -23,12 +23,11 @@
43.4 </run-dependency>
43.5 </dependency>
43.6 <dependency>
43.7 - <code-name-base>org.netbeans.libs.jsch</code-name-base>
43.8 + <code-name-base>com.jcraft.jsch</code-name-base>
43.9 <build-prerequisite/>
43.10 <compile-dependency/>
43.11 <run-dependency>
43.12 - <release-version>1</release-version>
43.13 - <specification-version>1.5</specification-version>
43.14 + <specification-version>0.1.43</specification-version>
43.15 </run-dependency>
43.16 </dependency>
43.17 <dependency>
44.1 --- a/nbbuild/antsrc/org/netbeans/nbbuild/MakeUpdateDesc.java Wed Jun 22 00:14:13 2011 -0400
44.2 +++ b/nbbuild/antsrc/org/netbeans/nbbuild/MakeUpdateDesc.java Wed Jun 22 10:11:09 2011 +0200
44.3 @@ -648,6 +648,7 @@
44.4 module.setAttribute("downloadsize", "0"); // recalculated anyway
44.5 Element manifest = doc.createElement("manifest");
44.6 module.appendChild(manifest);
44.7 + manifest.setAttribute("AutoUpdate-Show-In-Client", "false");
44.8 manifest.setAttribute("OpenIDE-Module", cnb);
44.9 String bundleName = loc(localized, attr, "Bundle-Name");
44.10 manifest.setAttribute("OpenIDE-Module-Name", bundleName != null ? bundleName : cnb);
44.11 @@ -658,7 +659,7 @@
44.12 if (requireBundle != null) {
44.13 StringBuilder b = new StringBuilder();
44.14 for (String dep : requireBundle.split(", ")) {
44.15 - Matcher m = Pattern.compile("([^;]+)(?:;bundle-version=\"\\[(\\d+)((?:[.][0-9]+)*),(\\d+)\\)\")?").matcher(dep);
44.16 + Matcher m = Pattern.compile("([^;]+)(.*)").matcher(dep);
44.17 if (!m.matches()) {
44.18 throw new BuildException("Could not parse dependency: " + dep);
44.19 }
44.20 @@ -666,18 +667,30 @@
44.21 b.append(", ");
44.22 }
44.23 b.append(m.group(1)); // dep CNB
44.24 - String majorS = m.group(2);
44.25 - if (majorS != null) {
44.26 - int major = Integer.parseInt(majorS);
44.27 - String rest = m.group(3);
44.28 - int max = Integer.parseInt(m.group(4));
44.29 - if (major > 99) {
44.30 - b.append('/').append(major / 100);
44.31 - if (max > major + 100) {
44.32 - b.append('-').append(max / 100 - 1);
44.33 + Matcher m2 = Pattern.compile(";([^:=]+):?=\"?([^;\"]+)\"?").matcher(m.group(2));
44.34 + while (m2.find()) {
44.35 + if (!m2.group(1).equals("bundle-version")) {
44.36 + continue;
44.37 + }
44.38 + String val = m2.group(2);
44.39 + Matcher m3 = Pattern.compile("\\[([0-9]+)((?:[.][0-9]+)*),([0-9.]+)\\)").matcher(val);
44.40 + if (!m3.matches()) {
44.41 + throw new BuildException("Could not parse version range: " + val);
44.42 + }
44.43 + int major = Integer.parseInt(m3.group(1));
44.44 + String rest = m3.group(2);
44.45 + try {
44.46 + int max = Integer.parseInt(m3.group(3));
44.47 + if (major > 99) {
44.48 + b.append('/').append(major / 100);
44.49 + if (max > major + 100) {
44.50 + b.append('-').append(max / 100 - 1);
44.51 + }
44.52 + } else if (max > 100) {
44.53 + b.append("/0-").append(max / 100 - 1);
44.54 }
44.55 - } else if (max > 100) {
44.56 - b.append("/0-").append(max / 100 - 1);
44.57 + } catch (NumberFormatException x) {
44.58 + // never mind end boundary, does not match NB conventions
44.59 }
44.60 b.append(" > ").append(major % 100).append(rest);
44.61 }
45.1 --- a/nbbuild/build.xml Wed Jun 22 00:14:13 2011 -0400
45.2 +++ b/nbbuild/build.xml Wed Jun 22 10:11:09 2011 +0200
45.3 @@ -561,6 +561,7 @@
45.4 <makeupdatedesc desc="nbms/catalog.xml" distbase="." uselicenseurl="${use.license.url.in.catalog}">
45.5 <fileset dir="nbms">
45.6 <include name="*.nbm"/>
45.7 + <include name="*.jar"/>
45.8 </fileset>
45.9 </makeupdatedesc>
45.10 </target>
45.11 @@ -1628,6 +1629,7 @@
45.12 <makeupdatedesc desc="${catalog.file}" distbase="${catalog.base.url}" automaticgrouping="true" uselicenseurl="${use.license.url.in.catalog}" notificationmessage="${catalog.notification.message}" notificationurl="${catalog.notification.url}">
45.13 <fileset dir="${nbms.location}">
45.14 <include name="**/*.nbm"/>
45.15 + <include name="**/*.jar"/>
45.16 </fileset>
45.17 <updaterjar>
45.18 <fileset dir="netbeans" includes="platform*/modules/ext/updater.jar"/>
46.1 --- a/nbbuild/cluster.properties Wed Jun 22 00:14:13 2011 -0400
46.2 +++ b/nbbuild/cluster.properties Wed Jun 22 10:11:09 2011 +0200
46.3 @@ -223,6 +223,8 @@
46.4 bugtracking,\
46.5 bugtracking.bridge,\
46.6 bugzilla,\
46.7 + c.jcraft.jsch,\
46.8 + c.jcraft.jzlib,\
46.9 core.browser,\
46.10 core.ide,\
46.11 csl.api,\
46.12 @@ -310,9 +312,7 @@
46.13 libs.ini4j,\
46.14 libs.jakarta_oro,\
46.15 libs.jaxb,\
46.16 - libs.jsch,\
46.17 libs.jvyamlb,\
46.18 - libs.jzlib,\
46.19 libs.lucene,\
46.20 libs.smack,\
46.21 libs.svnClientAdapter,\
46.22 @@ -1090,6 +1090,7 @@
46.23 languages.refactoring,\
46.24 libs.git,\
46.25 libs.xmlbeans,\
46.26 + o.eclipse.jgit,\
46.27 o.n.bluej,\
46.28 o.n.bluej.ui,\
46.29 uihandler.interactive,\
47.1 --- a/nbbuild/templates/common.xml Wed Jun 22 00:14:13 2011 -0400
47.2 +++ b/nbbuild/templates/common.xml Wed Jun 22 10:11:09 2011 +0200
47.3 @@ -318,7 +318,7 @@
47.4 </pathconvert>
47.5
47.6 <xmlvalidate warn="no"> <!-- failonerror="false" -->
47.7 - <fileset file="${src.dir}/${layer.file}"/>
47.8 + <fileset file="${src.dir}/${layer.file}" erroronmissingdir="false"/>
47.9 <xmlcatalog classpath="${dtd.cp}">
47.10 <dtd publicId="-//NetBeans//DTD Filesystem 1.0//EN"
47.11 location="org/openide/filesystems/filesystem.dtd"/>
48.1 --- a/nbbuild/test/unit/src/org/netbeans/nbbuild/MakeUpdateDescTest.java Wed Jun 22 00:14:13 2011 -0400
48.2 +++ b/nbbuild/test/unit/src/org/netbeans/nbbuild/MakeUpdateDescTest.java Wed Jun 22 10:11:09 2011 +0200
48.3 @@ -63,6 +63,8 @@
48.4 // As generated by JarWithModuleAttributes:
48.5 attr.putValue("Require-Bundle", "org.netbeans.api.progress;bundle-version=\"[101.19,200)\", " +
48.6 "org.netbeans.modules.options.api;bundle-version=\"[1.17,200)\", " +
48.7 + "com.jcraft.jsch;bundle-version=\"[0.1.37,0.2.0)\", " +
48.8 + "com.jcraft.jzlib;resolution:=optional, " +
48.9 "org.openide.actions;bundle-version=\"[6.15,100)\"");
48.10 Properties localization = new Properties();
48.11 localization.setProperty("OpenIDE-Module-Name", "My Bundle");
48.12 @@ -72,9 +74,13 @@
48.13 ByteArrayOutputStream baos = new ByteArrayOutputStream();
48.14 XMLUtil.write(e, baos);
48.15 assertEquals("<module codenamebase='bundle' distribution='' downloadsize='0'> <manifest " +
48.16 + "AutoUpdate-Show-In-Client='false' " +
48.17 "OpenIDE-Module='bundle' OpenIDE-Module-Display-Category='hello' " +
48.18 "OpenIDE-Module-Module-Dependencies='org.netbeans.api.progress/1 > 1.19, " +
48.19 - "org.netbeans.modules.options.api/0-1 > 1.17, org.openide.actions > 6.15' " +
48.20 + "org.netbeans.modules.options.api/0-1 > 1.17, " +
48.21 + "com.jcraft.jsch > 0.1.37, " +
48.22 + "com.jcraft.jzlib, " +
48.23 + "org.openide.actions > 6.15' " +
48.24 "OpenIDE-Module-Name='My Bundle' OpenIDE-Module-Short-Description='Hello there!' " +
48.25 "OpenIDE-Module-Specification-Version='0'/> " +
48.26 "</module> ", baos.toString().replace('"', '\'').replaceAll("\\s+", " "));
49.1 --- a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml Wed Jun 22 00:14:13 2011 -0400
49.2 +++ b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/AntModuleLayer.xml Wed Jun 22 10:11:09 2011 +0200
49.3 @@ -87,6 +87,18 @@
49.4 <attr name="position" intvalue="310"/>
49.5 </file>
49.6 </folder>
49.7 + <folder name="Hidden">
49.8 + <file name="com-jcraft-jzlib-antlibrary.instance">
49.9 + <attr name="instanceCreate" methodvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspath.url"/>
49.10 + <attr name="instanceOf" stringvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspathProvider"/>
49.11 + <attr name="url" urlvalue="nbinst://com.jcraft.jzlib/modules/com-jcraft-jzlib.jar"/>
49.12 + </file>
49.13 + <file name="com-jcraft-jsch-antlibrary.instance">
49.14 + <attr name="instanceCreate" methodvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspath.url"/>
49.15 + <attr name="instanceOf" stringvalue="org.apache.tools.ant.module.spi.AutomaticExtraClasspathProvider"/>
49.16 + <attr name="url" urlvalue="nbinst://com.jcraft.jsch/modules/com-jcraft-jsch.jar"/>
49.17 + </file>
49.18 + </folder>
49.19
49.20 </folder>
49.21
50.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
50.2 +++ b/o.eclipse.jgit/build.xml Wed Jun 22 10:11:09 2011 +0200
50.3 @@ -0,0 +1,5 @@
50.4 +<?xml version="1.0" encoding="UTF-8"?>
50.5 +<project name="o.eclipse.jgit" default="netbeans" basedir=".">
50.6 + <import file="../nbbuild/templates/projectized.xml"/>
50.7 + <target name="jar" depends="release"/>
50.8 +</project>
51.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
51.2 +++ b/o.eclipse.jgit/external/binaries-list Wed Jun 22 10:11:09 2011 +0200
51.3 @@ -0,0 +1,1 @@
51.4 +A5812C58289110F2AD656BB6A5AA15C8839E5442 org.eclipse.jgit-1.0.0-rc3.jar
51.5 \ No newline at end of file
52.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
52.2 +++ b/o.eclipse.jgit/external/org.eclipse.jgit-1.0.0-rc3-license.txt Wed Jun 22 10:11:09 2011 +0200
52.3 @@ -0,0 +1,44 @@
52.4 +Name: JGit Library
52.5 +Version: 1.0.0-rc3
52.6 +Description: Integration library for git client
52.7 +License: EDL-1.0
52.8 +OSR: 1234
52.9 +Origin: http://www.eclipse.org/jgit/
52.10 +
52.11 +This program and the accompanying materials are made available
52.12 +under the terms of the Eclipse Distribution License v1.0 which
52.13 +accompanies this distribution, is reproduced below, and is
52.14 +available at http://www.eclipse.org/org/documents/edl-v10.php
52.15 +
52.16 +All rights reserved.
52.17 +
52.18 +Redistribution and use in source and binary forms, with or
52.19 +without modification, are permitted provided that the following
52.20 +conditions are met:
52.21 +
52.22 +- Redistributions of source code must retain the above copyright
52.23 + notice, this list of conditions and the following disclaimer.
52.24 +
52.25 +- Redistributions in binary form must reproduce the above
52.26 + copyright notice, this list of conditions and the following
52.27 + disclaimer in the documentation and/or other materials provided
52.28 + with the distribution.
52.29 +
52.30 +- Neither the name of the Eclipse Foundation, Inc. nor the
52.31 + names of its contributors may be used to endorse or promote
52.32 + products derived from this software without specific prior
52.33 + written permission.
52.34 +
52.35 +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
52.36 +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
52.37 +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
52.38 +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
52.39 +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
52.40 +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52.41 +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
52.42 +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
52.43 +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
52.44 +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
52.45 +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
52.46 +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
52.47 +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
53.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
53.2 +++ b/o.eclipse.jgit/manifest.mf Wed Jun 22 10:11:09 2011 +0200
53.3 @@ -0,0 +1,1 @@
53.4 +OpenIDE-Module: org.eclipse.jgit
54.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
54.2 +++ b/o.eclipse.jgit/nbproject/project.properties Wed Jun 22 10:11:09 2011 +0200
54.3 @@ -0,0 +1,5 @@
54.4 +release.external/org.eclipse.jgit-1.0.0-rc3.jar=modules/org-eclipse-jgit.jar
54.5 +extra.license.files=external/org.eclipse.jgit-1.0.0-rc3-license.txt
54.6 +is.autoload=true
54.7 +nbm.homepage=http://netbeans.org/projects/versioncontrol/pages/Git_main
54.8 +nbm.module.author=Ondrej Vrabec
55.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
55.2 +++ b/o.eclipse.jgit/nbproject/project.xml Wed Jun 22 10:11:09 2011 +0200
55.3 @@ -0,0 +1,21 @@
55.4 +<?xml version="1.0" encoding="UTF-8"?>
55.5 +<project xmlns="http://www.netbeans.org/ns/project/1">
55.6 + <type>org.netbeans.modules.apisupport.project</type>
55.7 + <configuration>
55.8 + <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
55.9 + <code-name-base>org.eclipse.jgit</code-name-base>
55.10 + <module-dependencies>
55.11 + <dependency>
55.12 + <code-name-base>com.jcraft.jsch</code-name-base>
55.13 + <compile-dependency/>
55.14 + <run-dependency/>
55.15 + </dependency>
55.16 + </module-dependencies>
55.17 + <public-packages/>
55.18 + <class-path-extension>
55.19 + <runtime-relative-path>org-eclipse-jgit.jar</runtime-relative-path>
55.20 + <binary-origin>external/org.eclipse.jgit-1.0.0-rc3.jar</binary-origin>
55.21 + </class-path-extension>
55.22 + </data>
55.23 + </configuration>
55.24 +</project>
56.1 --- a/o.n.bootstrap/src/org/netbeans/NetigsoFramework.java Wed Jun 22 00:14:13 2011 -0400
56.2 +++ b/o.n.bootstrap/src/org/netbeans/NetigsoFramework.java Wed Jun 22 10:11:09 2011 +0200
56.3 @@ -213,6 +213,10 @@
56.4 toInit.add(nm);
56.5 return;
56.6 }
56.7 + if (!toEnable.isEmpty()) {
56.8 + getDefault().prepare(Lookup.getDefault(), toEnable);
56.9 + toEnable.clear();
56.10 + }
56.11 nm.start();
56.12 }
56.13
57.1 --- a/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateModulesTest.java Wed Jun 22 00:14:13 2011 -0400
57.2 +++ b/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateModulesTest.java Wed Jun 22 10:11:09 2011 +0200
57.3 @@ -133,6 +133,11 @@
57.4 if ("false".equals(mod.getAttribute("AutoUpdate-Show-In-Client"))) {
57.5 continue;
57.6 }
57.7 + if (mod.getAttribute("Bundle-SymbolicName") != null &&
57.8 + mod.getAttribute("AutoUpdate-Show-In-Client") == null
57.9 + ) {
57.10 + continue;
57.11 + }
57.12 if (mod.getLocalizedAttribute("OpenIDE-Module-Display-Category") == null) {
57.13 problems.append('\n').append(mod.getCodeNameBase());
57.14 }
57.15 @@ -235,7 +240,10 @@
57.16 private static String findCNB(Manifest m) {
57.17 String name = m.getMainAttributes().getValue("OpenIDE-Module");
57.18 if (name == null) {
57.19 - throw new IllegalArgumentException();
57.20 + name = m.getMainAttributes().getValue("Bundle-SymbolicName");
57.21 + if (name == null) {
57.22 + throw new IllegalArgumentException();
57.23 + }
57.24 }
57.25 return name.replaceFirst("/\\d+$", "");
57.26 }
58.1 --- a/php.project/nbproject/project.xml Wed Jun 22 00:14:13 2011 -0400
58.2 +++ b/php.project/nbproject/project.xml Wed Jun 22 10:11:09 2011 +0200
58.3 @@ -77,12 +77,11 @@
58.4 </run-dependency>
58.5 </dependency>
58.6 <dependency>
58.7 - <code-name-base>org.netbeans.libs.jsch</code-name-base>
58.8 + <code-name-base>com.jcraft.jsch</code-name-base>
58.9 <build-prerequisite/>
58.10 <compile-dependency/>
58.11 <run-dependency>
58.12 - <release-version>1</release-version>
58.13 - <specification-version>1.7</specification-version>
58.14 + <specification-version>0.1.43</specification-version>
58.15 </run-dependency>
58.16 </dependency>
58.17 <dependency>
59.1 --- a/versioning.system.cvss/nbproject/project.xml Wed Jun 22 00:14:13 2011 -0400
59.2 +++ b/versioning.system.cvss/nbproject/project.xml Wed Jun 22 10:11:09 2011 +0200
59.3 @@ -76,12 +76,11 @@
59.4 </run-dependency>
59.5 </dependency>
59.6 <dependency>
59.7 - <code-name-base>org.netbeans.libs.jsch</code-name-base>
59.8 + <code-name-base>com.jcraft.jsch</code-name-base>
59.9 <build-prerequisite/>
59.10 <compile-dependency/>
59.11 <run-dependency>
59.12 - <release-version>1</release-version>
59.13 - <specification-version>0.1.20</specification-version>
59.14 + <specification-version>0.1.43</specification-version>
59.15 </run-dependency>
59.16 </dependency>
59.17 <dependency>