This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 217340
Collapse All | Expand All

(-)a/java.api.common/apichanges.xml (+16 lines)
Lines 107-112 Link Here
107
    <changes>
107
    <changes>
108
        <change id="ClassPathModifierSupport-handleAntArtifacts">
108
        <change id="ClassPathModifierSupport-handleAntArtifacts">
109
            <api name="java-api-common"/>
109
            <api name="java-api-common"/>
110
            <summary>Added a helper method creating <code>LibraryImplementation3</code> for ant and maven projects.</summary>
111
            <version major="1" minor="40"/>
112
            <date day="30" month="8" year="2012"/>
113
            <author login="tzezula"/>
114
            <compatibility addition="yes"/>
115
            <description>
116
                <p>
117
                    Added a helper method creating default implementation of the <code>LibraryImplementation3</code>
118
                    interface for both Ant and Maven projects.
119
                </p>
120
            </description>
121
            <class package="org.netbeans.modules.java.api.common.util" name="CommonProjectUtils"/>
122
            <issue number="217340"/>
123
        </change>
124
        <change id="ClassPathModifierSupport-handleAntArtifacts">
125
            <api name="java-api-common"/>
110
            <summary>Added <code>ClassPathModifierSupport.handleAntArtifacts</code> correctly updating the build-impl.xml</summary>
126
            <summary>Added <code>ClassPathModifierSupport.handleAntArtifacts</code> correctly updating the build-impl.xml</summary>
111
            <version major="1" minor="38"/>
127
            <version major="1" minor="38"/>
112
            <date day="31" month="5" year="2012"/>
128
            <date day="31" month="5" year="2012"/>
(-)a/java.api.common/manifest.mf (-1 / +1 lines)
Lines 1-4 Link Here
1
Manifest-Version: 1.0
1
Manifest-Version: 1.0
2
OpenIDE-Module: org.netbeans.modules.java.api.common/0
2
OpenIDE-Module: org.netbeans.modules.java.api.common/0
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties
3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties
4
OpenIDE-Module-Specification-Version: 1.39
4
OpenIDE-Module-Specification-Version: 1.40
(-)a/java.api.common/src/org/netbeans/modules/java/api/common/util/CommonProjectUtils.java (+62 lines)
Lines 42-50 Link Here
42
42
43
package org.netbeans.modules.java.api.common.util;
43
package org.netbeans.modules.java.api.common.util;
44
44
45
import java.net.URL;
46
import java.util.Arrays;
45
import java.util.Collection;
47
import java.util.Collection;
46
import java.util.Collections;
48
import java.util.Collections;
49
import java.util.HashMap;
50
import java.util.Map;
47
import javax.lang.model.element.TypeElement;
51
import javax.lang.model.element.TypeElement;
52
import org.netbeans.api.annotations.common.NonNull;
48
import org.netbeans.api.java.classpath.ClassPath;
53
import org.netbeans.api.java.classpath.ClassPath;
49
import org.netbeans.api.java.platform.JavaPlatform;
54
import org.netbeans.api.java.platform.JavaPlatform;
50
import org.netbeans.api.java.platform.JavaPlatformManager;
55
import org.netbeans.api.java.platform.JavaPlatformManager;
Lines 53-59 Link Here
53
import org.netbeans.api.java.source.ElementHandle;
58
import org.netbeans.api.java.source.ElementHandle;
54
import org.netbeans.api.java.source.SourceUtils;
59
import org.netbeans.api.java.source.SourceUtils;
55
import org.netbeans.modules.java.api.common.project.ui.customizer.MainClassChooser;
60
import org.netbeans.modules.java.api.common.project.ui.customizer.MainClassChooser;
61
import org.netbeans.spi.project.libraries.LibraryImplementation3;
62
import org.netbeans.spi.project.libraries.support.LibrariesSupport;
56
import org.openide.filesystems.FileObject;
63
import org.openide.filesystems.FileObject;
64
import org.openide.util.Parameters;
57
65
58
/**
66
/**
59
 * Common project utilities. This is a helper class; all methods are static.
67
 * Common project utilities. This is a helper class; all methods are static.
Lines 133-136 Link Here
133
        return SourceUtils.isMainClass(className, cpInfo);
141
        return SourceUtils.isMainClass(className, cpInfo);
134
    }
142
    }
135
143
144
    /**
145
     * Creates a {@link LibraryImplementation3} that can subsequently be used with
146
     * both Ant and Maven based Java projects.
147
     * @param classpath local library classpath for use by Ant
148
     * @param src local library sources for use by Ant
149
     * @param javadoc local Javadoc path for use by Ant
150
     * @param mavendeps list of maven dependencies in the form of groupId:artifactId:version:type,
151
     *    for example org.eclipse.persistence:eclipselink:2.3.2:jar
152
     * @param mavenrepos list of maven repositories in the form of layout:url,
153
     *    for example default:http://download.eclipse.org/rt/eclipselink/maven.repo/
154
     * @return {@link LibraryImplementation3} representing the information passed as parameters
155
     * @since 1.40
156
     */
157
    public static LibraryImplementation3 createJavaLibraryImplementation(
158
            @NonNull final String name,
159
            @NonNull final URL[] classPath,
160
            @NonNull final URL[] sources,
161
            @NonNull final URL[] javadoc,
162
            @NonNull final String[] mavendeps,
163
            @NonNull final String[] mavenrepos) {
164
        Parameters.notNull("name", name);   //NOI18N
165
        Parameters.notNull("classPath", classPath); //NOI18N
166
        Parameters.notNull("src", sources); //NOI18N
167
        Parameters.notNull("javadoc", javadoc); //NOI18N
168
        Parameters.notNull("mavendeps", mavendeps);  //NOI18N
169
        Parameters.notNull("mavenrepos", mavenrepos);   //NOI18N
170
        final LibraryImplementation3 impl = LibrariesSupport.createLibraryImplementation3(
171
                "j2se",         //NOI18N
172
                "classpath",    //NOI18N
173
                "src",          //NOI18N
174
                "javadoc"       //NOI18N
175
                );
176
        impl.setName(name);
177
        impl.setContent("classpath", Arrays.asList(classPath)); //NOI18N
178
        impl.setContent("src", Arrays.asList(sources));     //NOI18N
179
        impl.setContent("javadoc", Arrays.asList(javadoc));     //NOI18N
180
        final Map<String,String> props = new HashMap<String, String>();
181
        // properties: "maven-dependencies", "maven-repositories"
182
        props.put("maven-dependencies", getPropertyValue(mavendeps));  //NOI18N
183
        props.put("maven-repositories", getPropertyValue(mavenrepos)); //NOI18N
184
        impl.setProperties(props);
185
        return impl;
186
    }
187
188
    @NonNull
189
    private static String getPropertyValue(@NonNull final String[] values) {
190
        final StringBuilder result = new StringBuilder();
191
        for (String value : values) {
192
            result.append(value);
193
            result.append(' '); //NOI18N
194
        }
195
        return result.substring(0, result.length()-1);
196
    }
197
136
}
198
}
(-)a/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/util/CommonProjectUtilsTest.java (+107 lines)
Line 0 Link Here
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
5
 *
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7
 * Other names may be trademarks of their respective owners.
8
 *
9
 * The contents of this file are subject to the terms of either the GNU
10
 * General Public License Version 2 only ("GPL") or the Common
11
 * Development and Distribution License("CDDL") (collectively, the
12
 * "License"). You may not use this file except in compliance with the
13
 * License. You can obtain a copy of the License at
14
 * http://www.netbeans.org/cddl-gplv2.html
15
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16
 * specific language governing permissions and limitations under the
17
 * License.  When distributing the software, include this License Header
18
 * Notice in each file and include the License file at
19
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
20
 * particular file as subject to the "Classpath" exception as provided
21
 * by Oracle in the GPL Version 2 section of the License file that
22
 * accompanied this code. If applicable, add the following below the
23
 * License Header, with the fields enclosed by brackets [] replaced by
24
 * your own identifying information:
25
 * "Portions Copyrighted [year] [name of copyright owner]"
26
 *
27
 * If you wish your version of this file to be governed by only the CDDL
28
 * or only the GPL Version 2, indicate your decision by adding
29
 * "[Contributor] elects to include this software in this distribution
30
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
31
 * single choice of license, a recipient has the option to distribute
32
 * your version of this file under either the CDDL, the GPL Version 2 or
33
 * to extend the choice of license to its licensees as provided above.
34
 * However, if you add GPL Version 2 code and therefore, elected the GPL
35
 * Version 2 license, then the option applies only if the new code is
36
 * made subject to such option by the copyright holder.
37
 *
38
 * Contributor(s):
39
 *
40
 * Portions Copyrighted 2012 Sun Microsystems, Inc.
41
 */
42
package org.netbeans.modules.java.api.common.util;
43
44
import java.io.IOException;
45
import java.net.URL;
46
import java.util.Arrays;
47
import org.netbeans.api.annotations.common.NonNull;
48
import org.netbeans.api.project.libraries.Library;
49
import org.netbeans.junit.NbTestCase;
50
import org.netbeans.spi.project.libraries.LibraryFactory;
51
52
/**
53
 *
54
 * @author Tomas Zezula
55
 */
56
public class CommonProjectUtilsTest extends NbTestCase {
57
58
    public CommonProjectUtilsTest(@NonNull final String name) {
59
        super(name);
60
    }
61
62
    public void testCreateJavaLibraryImplementation() throws IOException {
63
        final String name = "test-lib"; //NOI18N
64
        final URL[] classpath = { new URL("file:///a/cp/cp1.jar"), new URL("file:///a/cp/b/cp2.jar")};  //NOI18N
65
        final URL[] src = { new URL("file:///a/src/x/src1/"), new URL("file:///a/srcplus/src2.zip"), new URL("file:///a/src/src3")};    //NOI18N
66
        final URL[] javadoc = { new URL("http://example.com/my/remote/javadoc")};   //NOI18N
67
        final String[] mavendeps = {
68
            "com.sun.jersey.contribs:jersey-multipart:1.8:jar",         //NOI18N
69
            "com.sun.jersey.contribs:jersey-guice:1.8:jar",             //NOI18N
70
            "com.sun.jersey.contribs:jersey-simple-server:1.8:jar",     //NOI18N
71
            "com.sun.jersey.contribs.jersey-oauth:oauth-client:1.8:jar" //NOI18N
72
        };
73
        final String[] mavenrepos = {"default:http://download.eclipse.org/rt/eclipselink/maven.repo/"}; //NOI18N
74
        final Library lib = LibraryFactory.createLibrary(CommonProjectUtils.createJavaLibraryImplementation(
75
                name,
76
                classpath,
77
                src,
78
                javadoc,
79
                mavendeps,
80
                mavenrepos));
81
        assertJavaLibrary(name, classpath, src, javadoc, mavendeps, mavenrepos, lib);
82
    }
83
84
85
    private void assertJavaLibrary(
86
            @NonNull final String expectedName,
87
            @NonNull final URL[] expectedClassPath,
88
            @NonNull final URL[] expectedSrc,
89
            @NonNull final URL[] expectedJavadoc,
90
            @NonNull final String[] expectedMavenDeps,
91
            @NonNull final String[] expectedMavenRepos,
92
            @NonNull final Library lib) {
93
        assertEquals("Names are not equal", expectedName, lib.getName());   //NOI18N
94
        assertEquals("ClassPaths are not equal", Arrays.asList(expectedClassPath), lib.getContent("classpath"));    //NOI18N
95
        assertEquals("Sources are not equal", Arrays.asList(expectedSrc), lib.getContent("src"));    //NOI18N
96
        assertEquals("Javadocs are not equal", Arrays.asList(expectedJavadoc), lib.getContent("javadoc"));    //NOI18N
97
        assertEquals(
98
                "MavenDeps are not equal",          //NOI18N
99
                Arrays.asList(expectedMavenDeps),
100
                Arrays.asList(lib.getProperties().get("maven-dependencies").split("\\s"))); //NOI18N
101
        assertEquals(
102
                "MavenRepositories are not equal",          //NOI18N
103
                Arrays.asList(expectedMavenRepos),
104
                Arrays.asList(lib.getProperties().get("maven-repositories").split("\\s"))); //NOI18N
105
106
    }
107
}

Return to bug 217340