Skip to content

[NETBEANS-4946] - Improve JAVA/JAKARTA EE with Ant based projects #2491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthiasblaesing merged 1 commit into from
Mar 20, 2021
Merged

[NETBEANS-4946] - Improve JAVA/JAKARTA EE with Ant based projects #2491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions enterprise/j2ee.api.ejbmodule/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

is.autoload=true

javac.compilerargs=-Xlint:unchecked
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
javadoc.overview=${basedir}/arch/overview.html
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
Expand Down
4 changes: 2 additions & 2 deletions enterprise/j2ee.clientproject/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
# specific language governing permissions and limitations
# under the License.

javac.compilerargs=-Xlint:unchecked
spec.version.base=1.58.0
javadoc.arch=${basedir}/arch.xml
javadoc.preview=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8

test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
Expand Down
52 changes: 45 additions & 7 deletions ...ise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.SwingUtilities;
import org.netbeans.api.j2ee.core.Profile;
import org.netbeans.api.java.classpath.ClassPath;
Expand All @@ -49,6 +51,7 @@
import org.netbeans.modules.j2ee.dd.spi.webservices.WebservicesMetadataModelFactory;
import org.netbeans.modules.j2ee.deployment.common.api.EjbChangeDescriptor;
import org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment;
import org.netbeans.modules.j2ee.deployment.devmodules.api.InstanceRemovedException;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.devmodules.api.ModuleChangeReporter;
import org.netbeans.modules.j2ee.deployment.devmodules.api.ResourceChangeReporter;
Expand Down Expand Up @@ -138,10 +141,12 @@ public File getMetaInfAsFile() {
return getFile(AppClientProjectProperties.META_INF);
}

@Override
public File getResourceDirectory() {
return getFile(AppClientProjectProperties.RESOURCE_DIR);
}

@Override
public File getDeploymentConfigurationFile(String name) {
String path = getConfigSupport().getContentRelativePath(name);
if (path == null) {
Expand All @@ -164,15 +169,15 @@ public File[] getRequiredLibraries() {
FileUtil.toFile(project.getProjectDirectory()), project.evaluator(), new String[]{"javac.classpath"}));
List<File> files = new ArrayList<File>();
for (FileObject fo : cp.getRoots()) {
fo = FileUtil.getArchiveFile(fo);
if (fo == null) {
if (FileUtil.getArchiveFile(fo) == null) {
continue;
}
files.add(FileUtil.toFile(fo));
files.add(FileUtil.toFile(FileUtil.getArchiveFile(fo)));
}
return files.toArray(new File[files.size()]);
}

@Override
public FileObject getArchive() {
return getFileObject(AppClientProjectProperties.DIST_JAR);
}
Expand All @@ -194,13 +199,15 @@ private File getFile(String propname) {
return null;
}

@Override
public synchronized J2eeModule getJ2eeModule () {
if (j2eeModule == null) {
j2eeModule = J2eeModuleFactory.createJ2eeModule(this);
}
return j2eeModule;
}

@Override
public ModuleChangeReporter getModuleChangeReporter() {
return this;
}
Expand All @@ -220,15 +227,18 @@ public String getServerInstanceID() {
return helper.getStandardPropertyEvaluator().getProperty(AppClientProjectProperties.J2EE_SERVER_INSTANCE);
}

@Override
public void setServerInstanceID(String serverInstanceID) {
assert serverInstanceID != null : "passed serverInstanceID cannot be null";
AppClientProjectProperties.setServerInstance(project, helper, serverInstanceID);
}

@Override
public Iterator<J2eeModule.RootedEntry> getArchiveContents() throws IOException {
return new IT(getContentDirectory());
}

@Override
public FileObject getContentDirectory() {
return getFileObject(ProjectProperties.BUILD_CLASSES_DIR);
}
Expand All @@ -249,6 +259,7 @@ public File getContentDirectoryAsFile() {
// return null;
// }

@Override
public <T> MetadataModel<T> getMetadataModel(Class<T> type) {
if (type == AppClientMetadata.class) {
@SuppressWarnings("unchecked") // NOI18N
Expand Down Expand Up @@ -324,20 +335,29 @@ public FileObject getDD() {
return metaInfFo.getFileObject(WebServicesClientConstants.WEBSERVICES_DD, "xml"); // NOI18N
}

@Override
public EjbChangeDescriptor getEjbChanges(long timestamp) {
return this;
}

@Override
public J2eeModule.Type getModuleType() {
return J2eeModule.Type.CAR;
}

@Override
public String getModuleVersion() {
Profile p = Profile.fromPropertiesString(project.evaluator().getProperty(AppClientProjectProperties.J2EE_PLATFORM));
if (p == null) {
p = Profile.JAVA_EE_6_FULL;
return AppClient.VERSION_6_0;
}
if (Profile.JAVA_EE_5.equals(p)) {
if (Profile.JAKARTA_EE_8_FULL.equals(p) || Profile.JAKARTA_EE_8_WEB.equals(p)) {
return AppClient.VERSION_8_0;
} else if (Profile.JAVA_EE_8_FULL.equals(p) || Profile.JAVA_EE_8_WEB.equals(p)) {
return AppClient.VERSION_8_0;
} else if (Profile.JAVA_EE_7_FULL.equals(p) || Profile.JAVA_EE_7_WEB.equals(p)) {
return AppClient.VERSION_7_0;
} else if (Profile.JAVA_EE_5.equals(p)) {
return AppClient.VERSION_5_0;
} else if (Profile.J2EE_14.equals(p)) {
return AppClient.VERSION_1_4;
Expand All @@ -346,16 +366,22 @@ public String getModuleVersion() {
}
}

@Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(AppClient.PROPERTY_VERSION)) {
String oldVersion = (String) evt.getOldValue();
String newVersion = (String) evt.getNewValue();
getPropertyChangeSupport().firePropertyChange(J2eeModule.PROP_MODULE_VERSION, oldVersion, newVersion);
} else if (evt.getPropertyName().equals(AppClientProjectProperties.J2EE_SERVER_INSTANCE)) {
try {
Deployment d = Deployment.getDefault();
String oldServerID = evt.getOldValue() == null ? null : d.getServerID((String) evt.getOldValue());
String newServerID = evt.getNewValue() == null ? null : d.getServerID((String) evt.getNewValue());
String oldServerID = evt.getOldValue() == null ? null : d.getServerInstance((String) evt.getOldValue()).getServerID();
String newServerID = evt.getNewValue() == null ? null : d.getServerInstance((String) evt.getNewValue()).getServerID();
fireServerChange(oldServerID, newServerID);
} catch (InstanceRemovedException ie) {
// noop ignore
Logger.getLogger(AppClientProvider.class.getName()).log(Level.FINE, null, ie); //NO18N
}
} else if (AppClientProjectProperties.RESOURCE_DIR.equals(evt.getPropertyName())) {
String oldValue = (String)evt.getOldValue();
String newValue = (String)evt.getNewValue();
Expand All @@ -366,12 +392,14 @@ public void propertyChange(PropertyChangeEvent evt) {
}
}

@Override
public String getUrl() {
EditableProperties ep = helper.getProperties(AntProjectHelper.PROJECT_PROPERTIES_PATH);
String name = ep.getProperty(AppClientProjectProperties.JAR_NAME);
return name == null ? "" : ('/' + name);
}

@Override
public boolean isManifestChanged(long timestamp) {
return false;
}
Expand All @@ -380,10 +408,12 @@ public void setUrl(String url) {
throw new UnsupportedOperationException("Cannot customize URL of Application Client module"); // NOI18N
}

@Override
public boolean ejbsChanged() {
return false;
}

@Override
public String[] getChangedEjbs() {
return new String[] {};
}
Expand Down Expand Up @@ -449,11 +479,13 @@ private boolean isProjectOpen() {
}
}

@Override
public void addPropertyChangeListener(PropertyChangeListener listener) {
// XXX need to listen on the module version
getPropertyChangeSupport().addPropertyChangeListener(listener);
}

@Override
public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
if (propertyChangeSupport == null) {
return;
Expand All @@ -470,6 +502,7 @@ private synchronized PropertyChangeSupport getPropertyChangeSupport() {

private class AppClientResourceChangeReporter implements ResourceChangeReporterImplementation {

@Override
public boolean isServerResourceChanged(long lastDeploy) {
File resDir = getResourceDirectory();
if (resDir != null && resDir.exists() && resDir.isDirectory()) {
Expand All @@ -496,15 +529,18 @@ private IT(FileObject f) {
this.root = f;
}

@Override
public boolean hasNext() {
return ch.hasMoreElements();
}

@Override
public J2eeModule.RootedEntry next() {
FileObject f = (FileObject) ch.nextElement();
return new FSRootRE(root, f);
}

@Override
public void remove() {
throw new UnsupportedOperationException();
}
Expand All @@ -521,10 +557,12 @@ private static final class FSRootRE implements J2eeModule.RootedEntry {
this.root = root;
}

@Override
public FileObject getFileObject() {
return f;
}

@Override
public String getRelativePath() {
return FileUtil.getRelativePath(root, f);
}
Expand Down
Loading