diff -r 880ff190ff87 -r dd7a0d98e6ef uml.codegen/nbproject/project.properties --- a/uml.codegen/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.codegen/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,62 +1,61 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - -javac.source=1.6 -license.file=../license.txt -test.unit.cp.extra=\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-project.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-api-java.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectapi.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectuiapi.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-openide-src.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-refactoring.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-awt.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-loaders.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/core/org-openide-filesystems.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-modules.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-text.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-netbeans-core.jar: +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + +javac.source=1.6 +test.unit.cp.extra=\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-project.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-api-java.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectapi.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectuiapi.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-openide-src.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-refactoring.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-awt.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-loaders.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/core/org-openide-filesystems.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-modules.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-text.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-netbeans-core.jar: diff -r 880ff190ff87 -r dd7a0d98e6ef uml.designpattern/nbproject/project.properties --- a/uml.designpattern/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.designpattern/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,45 +1,44 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - - -javac.source=1.6 -license.file=../license.txt +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + + +javac.source=1.6 diff -r 880ff190ff87 -r dd7a0d98e6ef uml.diagrams/nbproject/project.properties --- a/uml.diagrams/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.diagrams/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,45 +1,44 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - -#javac.compilerargs=-Xlint -Xlint:-serial -javac.source=1.6 -license.file=../license.txt +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + +#javac.compilerargs=-Xlint -Xlint:-serial +javac.source=1.6 diff -r 880ff190ff87 -r dd7a0d98e6ef uml.documentation/nbproject/project.properties --- a/uml.documentation/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.documentation/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,52 +1,51 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - - -javac.source=1.6 -license.file=../license.txt -test.unit.cp.extra=\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ - +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + + +javac.source=1.6 +test.unit.cp.extra=\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ + diff -r 880ff190ff87 -r dd7a0d98e6ef uml.drawingarea/nbproject/project.properties --- a/uml.drawingarea/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.drawingarea/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,57 +1,56 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - - -javac.source=1.6 -license.file=../license.txt -test.unit.cp.extra=\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-palette.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-project.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-palette.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-actions.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-loaders.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/core/org-openide-filesystems.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-modules.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar:\ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + + +javac.source=1.6 +test.unit.cp.extra=\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-palette.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-project.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-palette.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-actions.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-loaders.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/core/org-openide-filesystems.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-modules.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar:\ diff -r 880ff190ff87 -r dd7a0d98e6ef uml.integration/nbproject/project.properties --- a/uml.integration/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.integration/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,65 +1,64 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - -javac.source=1.6 -license.file=../license.txt -test.unit.cp.extra=\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-project.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/javax-jmi-reflect.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-api-java.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-api-mdr.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-javacore.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectapi.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectuiapi.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-openide-src.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-refactoring.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-awt.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-loaders.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/core/org-openide-filesystems.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-modules.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-text.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-netbeans-core.jar: +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + +javac.source=1.6 +test.unit.cp.extra=\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-project.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/javax-jmi-reflect.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-api-java.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-api-mdr.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-javacore.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectapi.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectuiapi.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-openide-src.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-refactoring.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-awt.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-loaders.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/core/org-openide-filesystems.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-modules.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-text.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-netbeans-core.jar: diff -r 880ff190ff87 -r dd7a0d98e6ef uml.kit/manifest.mf --- a/uml.kit/manifest.mf Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.kit/manifest.mf Fri Oct 04 12:44:47 2013 +0200 @@ -1,5 +1,5 @@ -Manifest-Version: 1.0 -OpenIDE-Module: org.netbeans.modules.uml.kit -OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/uml/kit/Bundle.properties -OpenIDE-Module-Specification-Version: 1.5 - +Manifest-Version: 1.0 +OpenIDE-Module: org.netbeans.modules.uml.kit +OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/uml/kit/Bundle.properties +OpenIDE-Module-Specification-Version: 1.4 + diff -r 880ff190ff87 -r dd7a0d98e6ef uml.kit/nbproject/project.properties --- a/uml.kit/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.kit/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,50 +1,49 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - -javac.source=1.6 -license.file=../license.txt -nbm.homepage=http://uml.netbeans.org/ - -test.config.uicommit.includes=\ - org/netbeans/test/uml/validation/UMLValidationTests.class -# Currently uncompilable: -disable.qa-functional.tests=true +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + +javac.source=1.6 +nbm.homepage=http://uml.netbeans.org/ + +test.config.uicommit.includes=\ + org/netbeans/test/uml/validation/UMLValidationTests.class +# Currently uncompilable: +disable.qa-functional.tests=true diff -r 880ff190ff87 -r dd7a0d98e6ef uml.parser.java/nbproject/project.properties --- a/uml.parser.java/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.parser.java/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,50 +1,49 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - - -javac.source=1.6 -license.file=../license.txt -test.unit.cp.extra=\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/ext/antlr-2.7.2.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/ext/junit-3.8.1.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-jaxen.jar:\ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + + +javac.source=1.6 +test.unit.cp.extra=\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/ext/antlr-2.7.2.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/ext/junit-3.8.1.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-jaxen.jar:\ diff -r 880ff190ff87 -r dd7a0d98e6ef uml.project/nbproject/project.properties --- a/uml.project/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.project/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,90 +1,89 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - - -javac.source=1.6 -license.file=../license.txt -test.unit.cp.extra=\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/antlr272.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-dependencyanalyzer.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-designpattern.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-diagramcreator.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-documentation.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-drawingarea.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-palette.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-requirements.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-requirements-xmlrequirements.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-roseimport.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-webreport.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-integration.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-parser-java.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-parserviews.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-project.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-propertysupport.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/com-tomsawyer-module.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/ext/junit-3.8.1.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-jaxen.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-palette.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-editor.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/javax-jmi-reflect.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-api-java.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-api-mdr.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-jmi-javamodel.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-java.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-java-project.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-javacore.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-project-ant.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectapi.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectuiapi.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-actions.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-awt.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-dialogs.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-explorer.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-loaders.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-options.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/core/org-openide-filesystems.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-modules.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar:\ - ${netbeans.dest.dir}/../../uml/core/build/test/unit/classes: +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + + +javac.source=1.6 +test.unit.cp.extra=\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/antlr272.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-dependencyanalyzer.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-designpattern.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-diagramcreator.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-documentation.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-drawingarea.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-palette.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-requirements.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-requirements-xmlrequirements.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-roseimport.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-webreport.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-integration.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-parser-java.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-parserviews.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-project.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-propertysupport.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/com-tomsawyer-module.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/ext/junit-3.8.1.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-jaxen.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-palette.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-editor.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/javax-jmi-reflect.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-api-java.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-api-mdr.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-jmi-javamodel.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-java.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-java-project.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-javacore.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-project-ant.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectapi.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectuiapi.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-actions.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-awt.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-dialogs.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-explorer.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-loaders.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-options.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/core/org-openide-filesystems.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-modules.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar:\ + ${netbeans.dest.dir}/../../uml/core/build/test/unit/classes: diff -r 880ff190ff87 -r dd7a0d98e6ef uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLChildren.java --- a/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLChildren.java Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLChildren.java Fri Oct 04 12:44:47 2013 +0200 @@ -56,7 +56,6 @@ /** * * @author Trey Spiva - * @deprecated */ public class UMLChildren extends Children.Array { diff -r 880ff190ff87 -r dd7a0d98e6ef uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLChildrenNodesCollection.java --- a/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLChildrenNodesCollection.java Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLChildrenNodesCollection.java Fri Oct 04 12:44:47 2013 +0200 @@ -65,9 +65,6 @@ -/** - * @deprecated - */ public class UMLChildrenNodesCollection implements Collection, NodeListener { diff -r 880ff190ff87 -r dd7a0d98e6ef uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLElementNode.java --- a/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLElementNode.java Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.project/src/org/netbeans/modules/uml/project/ui/nodes/UMLElementNode.java Fri Oct 04 12:44:47 2013 +0200 @@ -55,7 +55,6 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.Enumeration; -import java.util.List; import javax.swing.Action; import javax.swing.Icon; @@ -77,7 +76,6 @@ import org.netbeans.modules.uml.core.metamodel.diagrams.TSDiagramDetails; import org.netbeans.modules.uml.core.scm.ISCMIntegrator; import org.netbeans.modules.uml.core.scm.SCMFeatureKind; -import org.netbeans.modules.uml.project.ui.NetBeansUMLProjectTreeModel; import org.netbeans.modules.uml.resources.images.ImageUtil; import org.netbeans.modules.uml.ui.controls.projecttree.IProjectTreeEventDispatcher; import org.netbeans.modules.uml.ui.controls.projecttree.IProjectTreeItem; @@ -91,7 +89,6 @@ import org.netbeans.modules.uml.ui.support.projecttreesupport.ITreeItem; import org.netbeans.modules.uml.ui.support.projecttreesupport.ITreeRelElement; import org.netbeans.modules.uml.ui.support.projecttreesupport.ProjectTreeComparable; -import org.openide.nodes.ChildFactory; /** @@ -147,7 +144,7 @@ */ public UMLElementNode(IProjectTreeItem data) { - super(); + super(new UMLChildren()); setData(data); setUpChildren(); addProjectTreeItemCookie(data); @@ -171,7 +168,7 @@ */ public UMLElementNode(Lookup lookup, IProjectTreeItem data) { - super(lookup); + super(new UMLChildren(), lookup); setData(data); //addChild(this); setUpChildren(); @@ -181,6 +178,7 @@ { super(ch, lookup); setData(data); + setUpChildren(); //addChild(this); //setChildren(new UMLChildren(this)); } @@ -197,7 +195,12 @@ */ public void setUpChildren() { - setChildren(Children.create(new UMLChildFactory(this), true)); + Children ch = getChildren(); + if (ch != null && ch instanceof UMLChildren) + { + final UMLChildren children = (UMLChildren)ch; + children.setItem(this); + } } //************************************************** @@ -1004,49 +1007,4 @@ return retVal; } - - /** - * Factory by which children of Node will be initialized - */ - class UMLChildFactory extends ChildFactory { - - private ITreeItem item = null; - - UMLChildFactory(ITreeItem item) { - this.item = item; - } - - /** - * Initializes children of node by firing item expanding event. - * - * @param children a list to add object to, (for now not used) - * - * @return true if node is initialized completely; false if list has - * been partially populated and this method should be called - * again to retrieve more children - */ - @Override - protected boolean createKeys(List children) { - final NetBeansUMLProjectTreeModel model = UMLModelRootNode.getProjectTreeModel(); - - // Debug.out.println("UMLChildren Firing node expand event"); - if (model != null) { - model.fireItemExpanding(item); - - item.setIsInitalized(true); - - return true; - } - - return false; - } - - /** - * Enforce no WaitNode is shown by returning null - */ - @Override - protected Node createWaitNode() { - return null; - } - } } diff -r 880ff190ff87 -r dd7a0d98e6ef uml.propertysupport/nbproject/project.properties --- a/uml.propertysupport/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.propertysupport/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,56 +1,55 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - - -javac.source=1.6 -license.file=../license.txt -test.unit.cp.extra=\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/javax-jmi-reflect.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-jdesktop-layout.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-awt.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-dialogs.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-explorer.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar:\ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + + +javac.source=1.6 +test.unit.cp.extra=\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/javax-jmi-reflect.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-jdesktop-layout.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-awt.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-dialogs.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-explorer.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar:\ diff -r 880ff190ff87 -r dd7a0d98e6ef uml.reporting/nbproject/project.properties --- a/uml.reporting/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.reporting/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,57 +1,56 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - - -javac.source=1.6 -license.file=../license.txt -test.unit.cp.extra=\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-integration.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-project.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-jaxen.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectapi.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectuiapi.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-dialogs.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar: +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + + +javac.source=1.6 +test.unit.cp.extra=\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-integration.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-project.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-jaxen.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectapi.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectuiapi.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-dialogs.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar: diff -r 880ff190ff87 -r dd7a0d98e6ef uml.requirements.doorsprovider/nbproject/project.properties --- a/uml.requirements.doorsprovider/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.requirements.doorsprovider/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,50 +1,49 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - - -# If adding dependencies on 3rd party jars (jdom, jgraph, etc.) -# uncomment this section... -#cp.extra=lib/jdom.jar: \ -# lib/jgraph.jar - -javac.source=1.6 -license.file=../license.txt +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + + +# If adding dependencies on 3rd party jars (jdom, jgraph, etc.) +# uncomment this section... +#cp.extra=lib/jdom.jar: \ +# lib/jgraph.jar + +javac.source=1.6 diff -r 880ff190ff87 -r dd7a0d98e6ef uml.requirements.xmlrequirements/nbproject/project.properties --- a/uml.requirements.xmlrequirements/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.requirements.xmlrequirements/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,51 +1,50 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - - -javac.source=1.6 -license.file=../license.txt -test.unit.cp.extra=\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-jaxen.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar: +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + + +javac.source=1.6 +test.unit.cp.extra=\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-jaxen.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar: diff -r 880ff190ff87 -r dd7a0d98e6ef uml.requirements/nbproject/project.properties --- a/uml.requirements/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.requirements/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,52 +1,51 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - - -javac.source=1.6 -license.file=../license.txt -test.unit.cp.extra=\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-designpattern.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-jaxen.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar: +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + + +javac.source=1.6 +test.unit.cp.extra=\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-designpattern.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/junit.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-jaxen.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar: diff -r 880ff190ff87 -r dd7a0d98e6ef uml.samples/nbproject/project.properties --- a/uml.samples/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.samples/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,47 +1,46 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - -javac.compilerargs=-Xlint -Xlint:-serial -javac.source=1.6 -license.file=../license.txt -nbm.homepage=http://uml.netbeans.org -nbm.module.author=Sun Microsystems, Inc. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + +javac.compilerargs=-Xlint -Xlint:-serial +javac.source=1.6 +nbm.homepage=http://uml.netbeans.org +nbm.module.author=Sun Microsystems, Inc. diff -r 880ff190ff87 -r dd7a0d98e6ef uml.widgets/nbproject/build-impl.xml --- a/uml.widgets/nbproject/build-impl.xml Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.widgets/nbproject/build-impl.xml Fri Oct 04 12:44:47 2013 +0200 @@ -1,45 +1,45 @@ - - - - - - - - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + You must set 'suite.dir' to point to your containing module suite + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 880ff190ff87 -r dd7a0d98e6ef uml.widgets/nbproject/genfiles.properties --- a/uml.widgets/nbproject/genfiles.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.widgets/nbproject/genfiles.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,8 +1,8 @@ -build.xml.data.CRC32=3fd76126 -build.xml.script.CRC32=8aa00a22 -build.xml.stylesheet.CRC32=a56c6a5b@1.43 -# 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=4fc8549e -nbproject/build-impl.xml.script.CRC32=f110da10 -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 +build.xml.data.CRC32=3fd76126 +build.xml.script.CRC32=8aa00a22 +build.xml.stylesheet.CRC32=a56c6a5b@1.43 +# 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=31cb8608 +nbproject/build-impl.xml.script.CRC32=f110da10 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56 diff -r 880ff190ff87 -r dd7a0d98e6ef uml.widgets/nbproject/project.properties --- a/uml.widgets/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.widgets/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,45 +1,44 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - -#javac.compilerargs=-Xlint -Xlint:-serial -javac.source=1.6 -license.file=../license.txt +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + +#javac.compilerargs=-Xlint -Xlint:-serial +javac.source=1.6 diff -r 880ff190ff87 -r dd7a0d98e6ef uml.widgets/nbproject/project.xml --- a/uml.widgets/nbproject/project.xml Fri Oct 04 12:46:27 2013 +0200 +++ b/uml.widgets/nbproject/project.xml Fri Oct 04 12:44:47 2013 +0200 @@ -1,4 +1,4 @@ - + - - org.netbeans.modules.apisupport.project - - - org.netbeans.modules.uml.widgets - - - - org.netbeans.api.visual - - - - 2.14 - - - - org.openide.util.lookup - - - - 8.19.1 - - - - - org.netbeans.modules.uml.diagrams - org.netbeans.modules.uml.drawingarea - org.netbeans.modules.uml.uicomponent - org.netbeans.modules.visual.form - org.netbeans.modules.uml.utils - org.netbeans.modules.uml.widgets - - - - +--> + + org.netbeans.modules.apisupport.project + + + org.netbeans.modules.uml.widgets + + + + org.netbeans.api.visual + + + + 2.14 + + + + org.openide.util.lookup + + + + 8.19 + + + + + org.netbeans.modules.uml.diagrams + org.netbeans.modules.uml.drawingarea + org.netbeans.modules.uml.uicomponent + org.netbeans.modules.visual.form + org.netbeans.modules.uml.utils + org.netbeans.modules.uml.widgets + + + + diff -r 880ff190ff87 -r dd7a0d98e6ef uml/nbproject/project.properties --- a/uml/nbproject/project.properties Fri Oct 04 12:46:27 2013 +0200 +++ b/uml/nbproject/project.properties Fri Oct 04 12:44:47 2013 +0200 @@ -1,74 +1,73 @@ -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -# -# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. -# -# Oracle and Java are registered trademarks of Oracle and/or its affiliates. -# Other names may be trademarks of their respective owners. -# -# The contents of this file are subject to the terms of either the GNU -# General Public License Version 2 only ("GPL") or the Common -# Development and Distribution License("CDDL") (collectively, the -# "License"). You may not use this file except in compliance with the -# License. You can obtain a copy of the License at -# http://www.netbeans.org/cddl-gplv2.html -# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the -# specific language governing permissions and limitations under the -# License. When distributing the software, include this License Header -# Notice in each file and include the License file at -# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the GPL Version 2 section of the License file that -# accompanied this code. If applicable, add the following below the -# License Header, with the fields enclosed by brackets [] replaced by -# your own identifying information: -# "Portions Copyrighted [year] [name of copyright owner]" -# -# Contributor(s): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun -# Microsystems, Inc. All Rights Reserved. -# -# If you wish your version of this file to be governed by only the CDDL -# or only the GPL Version 2, indicate your decision by adding -# "[Contributor] elects to include this software in this distribution -# under the [CDDL or GPL Version 2] license." If you do not indicate a -# single choice of license, a recipient has the option to distribute -# your version of this file under either the CDDL, the GPL Version 2 or -# to extend the choice of license to its licensees as provided above. -# However, if you add GPL Version 2 code and therefore, elected the GPL -# Version 2 license, then the option applies only if the new code is -# made subject to such option by the copyright holder. - -javac.source=1.6 -build.compiler=extJavac -javac.compilerargs=-J-Xmx512m -javahelp.hs=uml-javahelp.hs - -license.file=../license.txt -test.unit.cp.extra=\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-diagramcreator.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/ext/antlr-2.7.2.jar:\ - ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-dom4jlib.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/ext/junit-3.8.1.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-api-java.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectapi.jar:\ - ${netbeans.dest.dir}/${ide.dir.name}/modules/org-openide-src.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-awt.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-actions.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-dialogs.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-explorer.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-loaders.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-netbeans-api-progress.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-io.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/core/org-openide-filesystems.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/core/core.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-modules.jar:\ - ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar: - -extra.module.files=\ - modules/DoorsIntegrationFiles/**,\ - modules/Libraries/** +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. +# +# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +# +# Oracle and Java are registered trademarks of Oracle and/or its affiliates. +# Other names may be trademarks of their respective owners. +# +# The contents of this file are subject to the terms of either the GNU +# General Public License Version 2 only ("GPL") or the Common +# Development and Distribution License("CDDL") (collectively, the +# "License"). You may not use this file except in compliance with the +# License. You can obtain a copy of the License at +# http://www.netbeans.org/cddl-gplv2.html +# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +# specific language governing permissions and limitations under the +# License. When distributing the software, include this License Header +# Notice in each file and include the License file at +# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the GPL Version 2 section of the License file that +# accompanied this code. If applicable, add the following below the +# License Header, with the fields enclosed by brackets [] replaced by +# your own identifying information: +# "Portions Copyrighted [year] [name of copyright owner]" +# +# Contributor(s): +# +# The Original Software is NetBeans. The Initial Developer of the Original +# Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun +# Microsystems, Inc. All Rights Reserved. +# +# If you wish your version of this file to be governed by only the CDDL +# or only the GPL Version 2, indicate your decision by adding +# "[Contributor] elects to include this software in this distribution +# under the [CDDL or GPL Version 2] license." If you do not indicate a +# single choice of license, a recipient has the option to distribute +# your version of this file under either the CDDL, the GPL Version 2 or +# to extend the choice of license to its licensees as provided above. +# However, if you add GPL Version 2 code and therefore, elected the GPL +# Version 2 license, then the option applies only if the new code is +# made subject to such option by the copyright holder. + +javac.source=1.6 +build.compiler=extJavac +javac.compilerargs=-J-Xmx512m +javahelp.hs=uml-javahelp.hs + +test.unit.cp.extra=\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-diagramcreator.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/ext/antlr-2.7.2.jar:\ + ${netbeans.dest.dir}/${cluster.dir.name}/modules/org-netbeans-modules-uml-dom4jlib.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/ext/junit-3.8.1.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-api-java.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-netbeans-modules-projectapi.jar:\ + ${netbeans.dest.dir}/${ide.dir.name}/modules/org-openide-src.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-awt.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-actions.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-dialogs.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-explorer.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-loaders.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-nodes.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-windows.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-netbeans-api-progress.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/modules/org-openide-io.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/core/org-openide-filesystems.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/core/core.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-modules.jar:\ + ${netbeans.dest.dir}/${platform.dir.name}/lib/org-openide-util.jar: + +extra.module.files=\ + modules/DoorsIntegrationFiles/**,\ + modules/Libraries/**