Skip to content

Commit d307898

Browse files
jGauravGuptajGauravGupta
authored
Merge pull request #69 from jGauravGupta/FISH-7526-2
FISH-7526 Build classpath not having all jars from payara/glassfish/lib
2 parents 7f0aa90 + 9eafe85 commit d307898

20 files changed

Lines changed: 318 additions & 215 deletions

‎bundles/fish.payara.eclipse.tools.server/plugin.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@
163163

164164
<project-facet-version facet="glassfish.web" version="3.1">
165165
<action type="INSTALL">
166-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishWebFacetInstallDelegate"/>
166+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetInstallDelegate"/>
167167
</action>
168168
<action type="UNINSTALL">
169-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishWebFacetUninstallDelegate"/>
169+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetUninstallDelegate"/>
170170
</action>
171171
<constraint>
172172
<requires facet="jst.web"/>
@@ -175,10 +175,10 @@
175175

176176
<project-facet-version facet="glassfish.web" version="4.0">
177177
<action type="INSTALL">
178-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishWebFacetInstallDelegate"/>
178+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetInstallDelegate"/>
179179
</action>
180180
<action type="UNINSTALL">
181-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishWebFacetUninstallDelegate"/>
181+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetUninstallDelegate"/>
182182
</action>
183183
<constraint>
184184
<requires facet="jst.web"/>
@@ -187,10 +187,10 @@
187187

188188
<project-facet-version facet="glassfish.web" version="5">
189189
<action type="INSTALL">
190-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishWebFacetInstallDelegate"/>
190+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetInstallDelegate"/>
191191
</action>
192192
<action type="UNINSTALL">
193-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishWebFacetUninstallDelegate"/>
193+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetUninstallDelegate"/>
194194
</action>
195195
<constraint>
196196
<requires facet="jst.web"/>
@@ -199,10 +199,10 @@
199199

200200
<project-facet-version facet="glassfish.ejb" version="3.1">
201201
<action type="INSTALL">
202-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishEjbFacetInstallDelegate"/>
202+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetInstallDelegate"/>
203203
</action>
204204
<action type="UNINSTALL">
205-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishEjbFacetUninstallDelegate"/>
205+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetUninstallDelegate"/>
206206
</action>
207207
<constraint>
208208
<requires facet="jst.ejb"/>
@@ -211,10 +211,10 @@
211211

212212
<project-facet-version facet="glassfish.ejb" version="4.0">
213213
<action type="INSTALL">
214-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishEjbFacetInstallDelegate"/>
214+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetInstallDelegate"/>
215215
</action>
216216
<action type="UNINSTALL">
217-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishEjbFacetUninstallDelegate"/>
217+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetUninstallDelegate"/>
218218
</action>
219219
<constraint>
220220
<requires facet="jst.ejb"/>
@@ -223,10 +223,10 @@
223223

224224
<project-facet-version facet="glassfish.ejb" version="5">
225225
<action type="INSTALL">
226-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishEjbFacetInstallDelegate"/>
226+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetInstallDelegate"/>
227227
</action>
228228
<action type="UNINSTALL">
229-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishEjbFacetUninstallDelegate"/>
229+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetUninstallDelegate"/>
230230
</action>
231231
<constraint>
232232
<requires facet="jst.ejb"/>

‎bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/PayaraServer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import static fish.payara.eclipse.tools.server.PayaraServerPlugin.createErrorStatus;
3030
import static fish.payara.eclipse.tools.server.PayaraServerPlugin.logError;
3131
import static fish.payara.eclipse.tools.server.PayaraServerPlugin.logMessage;
32-
import static fish.payara.eclipse.tools.server.facets.internal.GlassfishDeploymentDescriptorFactory.getWebDeploymentDescriptor;
32+
import static fish.payara.eclipse.tools.server.facets.internal.PayaraDeploymentDescriptorFactory.getWebDeploymentDescriptor;
3333
import static fish.payara.eclipse.tools.server.sdk.server.parser.TreeParser.readXml;
3434
import static fish.payara.eclipse.tools.server.utils.ModuleUtil.isEARModule;
3535
import static fish.payara.eclipse.tools.server.utils.ModuleUtil.isEJBModule;

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/IGlassfishDeploymentDescriptor.java renamed to bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/IPayaraDeploymentDescriptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
******************************************************************************/
99

1010
/******************************************************************************
11-
* Copyright (c) 2018-2022 Payara Foundation
11+
* Copyright (c) 2018-2023 Payara Foundation
1212
* All rights reserved. This program and the accompanying materials
1313
* are made available under the terms of the Eclipse Public License v2.0
1414
* which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@
2121
import org.eclipse.core.runtime.CoreException;
2222
import org.eclipse.core.runtime.IProgressMonitor;
2323

24-
public interface IGlassfishDeploymentDescriptor {
24+
public interface IPayaraDeploymentDescriptor {
2525

2626
public void store(IProgressMonitor monitor) throws CoreException;
2727

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/IGlassfishEjbDeploymentDescriptor.java renamed to bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/IPayaraEjbDeploymentDescriptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
******************************************************************************/
99

1010
/******************************************************************************
11-
* Copyright (c) 2018-2022 Payara Foundation
11+
* Copyright (c) 2018-2023 Payara Foundation
1212
* All rights reserved. This program and the accompanying materials
1313
* are made available under the terms of the Eclipse Public License v2.0
1414
* which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
1818

1919
package fish.payara.eclipse.tools.server.facets;
2020

21-
public interface IGlassfishEjbDeploymentDescriptor extends IGlassfishDeploymentDescriptor {
21+
public interface IPayaraEjbDeploymentDescriptor extends IPayaraDeploymentDescriptor {
2222

2323
static final String SUN_EJB_DEPLOYMENT_DESCRIPTOR_NAME = "sun-ejb-jar.xml";
2424

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/IGlassfishWebDeploymentDescriptor.java renamed to bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/IPayaraWebDeploymentDescriptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
******************************************************************************/
99

1010
/******************************************************************************
11-
* Copyright (c) 2018-2022 Payara Foundation
11+
* Copyright (c) 2018-2023 Payara Foundation
1212
* All rights reserved. This program and the accompanying materials
1313
* are made available under the terms of the Eclipse Public License v2.0
1414
* which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
1818

1919
package fish.payara.eclipse.tools.server.facets;
2020

21-
public interface IGlassfishWebDeploymentDescriptor extends IGlassfishDeploymentDescriptor {
21+
public interface IPayaraWebDeploymentDescriptor extends IPayaraDeploymentDescriptor {
2222

2323
static final String SUN_WEB_DEPLOYMENT_DESCRIPTOR_NAME = "sun-web.xml";
2424

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/GlassfishEjbFacetInstallDelegate.java renamed to bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/PayaraEjbFacetInstallDelegate.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
******************************************************************************/
99

1010
/******************************************************************************
11-
* Copyright (c) 2018-2022 Payara Foundation
11+
* Copyright (c) 2018-2023 Payara Foundation
1212
* All rights reserved. This program and the accompanying materials
1313
* are made available under the terms of the Eclipse Public License v2.0
1414
* which accompanies this distribution, and is available at
@@ -24,13 +24,13 @@
2424
import org.eclipse.wst.common.project.facet.core.IDelegate;
2525
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
2626

27-
import fish.payara.eclipse.tools.server.facets.internal.GlassfishDeploymentDescriptorFactory;
27+
import fish.payara.eclipse.tools.server.facets.internal.PayaraDeploymentDescriptorFactory;
2828

29-
public class GlassfishEjbFacetInstallDelegate implements IDelegate {
29+
public class PayaraEjbFacetInstallDelegate implements IDelegate {
3030

3131
@Override
3232
public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
33-
IGlassfishDeploymentDescriptor ejbDescriptor = GlassfishDeploymentDescriptorFactory
33+
IPayaraDeploymentDescriptor ejbDescriptor = PayaraDeploymentDescriptorFactory
3434
.getEjbDeploymentDescriptor(project);
3535

3636
if (ejbDescriptor != null) {

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/GlassfishEjbFacetUninstallDelegate.java renamed to bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/PayaraEjbFacetUninstallDelegate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
******************************************************************************/
99

1010
/******************************************************************************
11-
* Copyright (c) 2018-2022 Payara Foundation
11+
* Copyright (c) 2018-2023 Payara Foundation
1212
* All rights reserved. This program and the accompanying materials
1313
* are made available under the terms of the Eclipse Public License v2.0
1414
* which accompanies this distribution, and is available at
@@ -24,7 +24,7 @@
2424
import org.eclipse.wst.common.project.facet.core.IDelegate;
2525
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
2626

27-
public class GlassfishEjbFacetUninstallDelegate implements IDelegate {
27+
public class PayaraEjbFacetUninstallDelegate implements IDelegate {
2828

2929
@Override
3030
public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/GlassfishWebFacetInstallDelegate.java renamed to bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/PayaraWebFacetInstallDelegate.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
******************************************************************************/
99

1010
/******************************************************************************
11-
* Copyright (c) 2018-2022 Payara Foundation
11+
* Copyright (c) 2018-2023 Payara Foundation
1212
* All rights reserved. This program and the accompanying materials
1313
* are made available under the terms of the Eclipse Public License v2.0
1414
* which accompanies this distribution, and is available at
@@ -26,13 +26,13 @@
2626
import org.eclipse.wst.common.project.facet.core.IDelegate;
2727
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
2828

29-
import fish.payara.eclipse.tools.server.facets.internal.GlassfishDeploymentDescriptorFactory;
29+
import fish.payara.eclipse.tools.server.facets.internal.PayaraDeploymentDescriptorFactory;
3030

31-
public class GlassfishWebFacetInstallDelegate implements IDelegate {
31+
public class PayaraWebFacetInstallDelegate implements IDelegate {
3232

3333
@Override
3434
public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
35-
IGlassfishWebDeploymentDescriptor webDescriptor = GlassfishDeploymentDescriptorFactory
35+
IPayaraWebDeploymentDescriptor webDescriptor = PayaraDeploymentDescriptorFactory
3636
.getWebDeploymentDescriptor(project);
3737

3838
if (webDescriptor != null) {

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/GlassfishWebFacetUninstallDelegate.java renamed to bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/PayaraWebFacetUninstallDelegate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
******************************************************************************/
99

1010
/******************************************************************************
11-
* Copyright (c) 2018-2022 Payara Foundation
11+
* Copyright (c) 2018-2023 Payara Foundation
1212
* All rights reserved. This program and the accompanying materials
1313
* are made available under the terms of the Eclipse Public License v2.0
1414
* which accompanies this distribution, and is available at
@@ -24,7 +24,7 @@
2424
import org.eclipse.wst.common.project.facet.core.IDelegate;
2525
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
2626

27-
public class GlassfishWebFacetUninstallDelegate implements IDelegate {
27+
public class PayaraWebFacetUninstallDelegate implements IDelegate {
2828

2929
@Override
3030
public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/internal/AbstractGlassfishDeploymentDescriptor.java renamed to bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/facets/internal/AbstractPayaraDeploymentDescriptor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
******************************************************************************/
99

1010
/******************************************************************************
11-
* Copyright (c) 2018-2022 Payara Foundation
11+
* Copyright (c) 2018-2023 Payara Foundation
1212
* All rights reserved. This program and the accompanying materials
1313
* are made available under the terms of the Eclipse Public License v2.0
1414
* which accompanies this distribution, and is available at
@@ -21,10 +21,10 @@
2121
import org.eclipse.core.runtime.CoreException;
2222
import org.eclipse.core.runtime.IProgressMonitor;
2323

24-
import fish.payara.eclipse.tools.server.facets.IGlassfishDeploymentDescriptor;
24+
import fish.payara.eclipse.tools.server.facets.IPayaraDeploymentDescriptor;
2525

26-
abstract class AbstractGlassfishDeploymentDescriptor implements
27-
IGlassfishDeploymentDescriptor {
26+
abstract class AbstractPayaraDeploymentDescriptor implements
27+
IPayaraDeploymentDescriptor {
2828

2929
/**
3030
* Created new deployment descriptor if it's not already there.

0 commit comments

Comments
 (0)