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 247013
Collapse All | Expand All

(-)a/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java (-4 / +9 lines)
Lines 1-7 Link Here
1
/*
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
3
 *
4
 * Copyright 2012-2013 Oracle and/or its affiliates. All rights reserved.
4
 * Copyright 2012-2015 Oracle and/or its affiliates. All rights reserved.
5
 *
5
 *
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7
 * Other names may be trademarks of their respective owners.
7
 * Other names may be trademarks of their respective owners.
Lines 75-83 Link Here
75
            = new Config.Next(GlassFishVersion.GF_4,
75
            = new Config.Next(GlassFishVersion.GF_4,
76
            ConfigBuilderProvider.class.getResource("GlassFishV4.xml"));
76
            ConfigBuilderProvider.class.getResource("GlassFishV4.xml"));
77
77
78
    /** Library builder configuration since GlassFish 4.1. */
79
    private static final Config.Next CONFIG_V4_1
80
            = new Config.Next(GlassFishVersion.GF_4_1,
81
            ConfigBuilderProvider.class.getResource("GlassFishV4_1.xml"));
82
78
    /** Library builder configuration for GlassFish cloud. */
83
    /** Library builder configuration for GlassFish cloud. */
79
    private static final Config config
84
    private static final Config config
80
            = new Config(CONFIG_V3, CONFIG_V4);
85
            = new Config(CONFIG_V3, CONFIG_V4, CONFIG_V4_1);
81
86
82
    /** Builders array for each server instance. */
87
    /** Builders array for each server instance. */
83
    private static final Map<GlassFishServer, ConfigBuilder> builders
88
    private static final Map<GlassFishServer, ConfigBuilder> builders
Lines 119-126 Link Here
119
                return builder;
124
                return builder;
120
            }
125
            }
121
            String serverHome = server.getServerHome();
126
            String serverHome = server.getServerHome();
122
            builders.put(server, builder = new ConfigBuilder(
127
            builder = new ConfigBuilder(config, serverHome, serverHome, serverHome);
123
                    config, serverHome, serverHome, serverHome));
128
            builders.put(server, builder);
124
        }
129
        }
125
        return builder;
130
        return builder;
126
    }
131
    }
(-)b225783ed619 (+118 lines)
Added Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<!--
3
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4
5
Copyright 2012-2015 Oracle and/or its affiliates. All rights reserved.
6
7
Oracle and Java are registered trademarks of Oracle and/or its affiliates.
8
Other names may be trademarks of their respective owners.
9
10
The contents of this file are subject to the terms of either the GNU
11
General Public License Version 2 only ("GPL") or the Common
12
Development and Distribution License("CDDL") (collectively, the
13
"License"). You may not use this file except in compliance with the
14
License. You can obtain a copy of the License at
15
https://java.net/projects/gf-tooling/pages/License or LICENSE.TXT.
16
See the License for the specific language governing permissions
17
and limitations under the License.  When distributing the software,
18
include this License Header Notice in each file and include the License
19
file at LICENSE.TXT. Oracle designates this particular file as subject
20
to the "Classpath" exception as provided by Oracle in the GPL Version 2
21
section of the License file that accompanied this code. If applicable,
22
add the following below the License Header, with the fields enclosed
23
by brackets [] replaced by your own identifying information:
24
"Portions Copyrighted [year] [name of copyright owner]"
25
26
If you wish your version of this file to be governed by only the CDDL
27
or only the GPL Version 2, indicate your decision by adding
28
"[Contributor] elects to include this software in this distribution
29
under the [CDDL or GPL Version 2] license." If you do not indicate a
30
single choice of license, a recipient has the option to distribute
31
your version of this file under either the CDDL, the GPL Version 2 or
32
to extend the choice of license to its licensees as provided above.
33
However, if you add GPL Version 2 code and therefore, elected the GPL
34
Version 2 license, then the option applies only if the new code is
35
made subject to such option by the copyright holder.
36
37
Contributor(s):
38
39
Portions Copyrighted 2008 Sun Microsystems, Inc.
40
-->
41
<server>
42
    <tools lib="lib">
43
        <asadmin jar="client/appserver-cli.jar"/>
44
    </tools>
45
    <java version="1.7">
46
        <platform version="1.7"/>
47
        <platform version="1.8"/>
48
    </java>
49
    <javaee version="1.7">
50
        <profile version="1.3" type="full"/>
51
        <profile version="1.4" type="full"/>
52
        <profile version="1.5" type="full"/>
53
        <profile version="1.6" type="web"/>
54
        <profile version="1.6" type="full" check="full"/>
55
        <profile version="1.7" type="web"/>
56
        <profile version="1.7" type="full" check="full"/>
57
        <module type="war"/>
58
        <module type="car" check="full"/>
59
        <module type="ear" check="full"/>
60
        <module type="ejb" check="full"/>
61
        <module type="rar" check="full"/>
62
        <check name="full">
63
            <file path="appclient-server-core.jar"/>
64
        </check>
65
    </javaee>
66
    <library id="Java EE">
67
        <classpath>
68
            <fileset dir="modules">
69
                <include name="javax\..+\.jar"/>
70
                <include name="bean-validator.jar"/>
71
                <include name="cdi-api.jar"/>
72
                <include name="jaxb-osgi.jar"/>
73
                <include name="jaxr-api-osgi.jar"/>
74
                <include name="jaxrpc-api-osgi.jar"/>
75
                <include name="webservices-osgi.jar"/>
76
                <include name="weld-osgi-bundle.jar"/>
77
            </fileset>            
78
            <fileset dir="modules/endorsed">
79
                <include name=".+\.jar"/>
80
            </fileset>
81
            <fileset dir="../mq/lib">
82
                <include name="jaxm-api.jar"/>
83
            </fileset>
84
        </classpath>
85
        <javadocs>
86
            <lookup path="docs/javaee-doc-api.jar"/>
87
        </javadocs>
88
        <sources>
89
        </sources>
90
    </library>
91
    <library id="Jersey 2">
92
        <classpath>
93
            <fileset dir="modules">
94
                <include name="guava.+\.jar"/>
95
                <include name="jackson.+\.jar"/>
96
                <!-- include name="javax.ws.+\.jar"/ -->
97
                <include name="jersey.+\.jar"/>
98
                <include name="jettison.*\.jar"/>
99
            </fileset>
100
        </classpath>
101
        <javadocs> 
102
            <link url="http://repo1.maven.org/maven2/org/glassfish/jersey/jersey-documentation/2.0-m05-2/jersey-documentation-2.0-m05-2-docbook.zip"/>
103
        </javadocs>
104
        <sources>
105
        </sources>
106
    </library>
107
    <library id="JAX-RS">
108
        <classpath>
109
            <fileset dir="modules">
110
                <include name="javax.ws.rs-api.jar"/>
111
            </fileset>
112
        </classpath>
113
        <javadocs> 
114
        </javadocs>
115
        <sources>
116
        </sources>
117
    </library>
118
</server>

Return to bug 247013