1.1 --- a/j2ee.ejbfreeform/nbproject/project.properties Fri Jun 01 13:58:28 2007 +0000
1.2 +++ b/j2ee.ejbfreeform/nbproject/project.properties Fri Jun 01 14:59:48 2007 +0000
1.3 @@ -15,6 +15,8 @@
1.4 # Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
1.5 # Microsystems, Inc. All Rights Reserved.
1.6
1.7 +javac.compilerargs=-Xlint -Xlint:-serial
1.8 +javac.source=1.5
1.9 javadoc.arch=${basedir}/arch.xml
1.10
1.11 cp.extra=
2.1 --- a/j2ee.ejbfreeform/src/org/netbeans/modules/j2ee/ejbfreeform/EJBFreeformModule.java Fri Jun 01 13:58:28 2007 +0000
2.2 +++ b/j2ee.ejbfreeform/src/org/netbeans/modules/j2ee/ejbfreeform/EJBFreeformModule.java Fri Jun 01 14:59:48 2007 +0000
2.3 @@ -28,10 +28,11 @@
2.4 import org.netbeans.modules.j2ee.dd.api.common.RootInterface;
2.5 import org.netbeans.modules.j2ee.dd.api.ejb.EjbJar;
2.6 import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
2.7 +import org.netbeans.modules.j2ee.dd.api.ejb.EjbJarMetadata;
2.8 import org.netbeans.modules.j2ee.dd.api.webservices.Webservices;
2.9 import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
2.10 import org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleImplementation;
2.11 -import org.netbeans.modules.schema2beans.BaseBean;
2.12 +import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
2.13 import org.netbeans.spi.project.support.ant.AntProjectHelper;
2.14 import org.netbeans.spi.project.support.ant.PropertyEvaluator;
2.15 import org.openide.DialogDisplayer;
2.16 @@ -39,6 +40,7 @@
2.17 import org.openide.filesystems.FileObject;
2.18 import org.openide.filesystems.FileUtil;
2.19 import org.openide.util.NbBundle;
2.20 +import org.openide.util.NotImplementedException;
2.21 import org.openide.util.WeakListeners;
2.22
2.23 /**
2.24 @@ -72,14 +74,28 @@
2.25
2.26 public void setUrl(String url) {
2.27 }
2.28 -
2.29 - public RootInterface getDeploymentDescriptor(String location) {
2.30 - if (J2eeModule.EJBJAR_XML.equals(location)){
2.31 - return getEjbJar();
2.32 - } else if(J2eeModule.EJBSERVICES_XML.equals(location)){
2.33 - return getWebservices();
2.34 +
2.35 +// TODO MetadataModel: rewrite when MetadataModel is ready
2.36 +// public RootInterface getDeploymentDescriptor(String location) {
2.37 +// if (J2eeModule.EJBJAR_XML.equals(location)){
2.38 +// return getEjbJar();
2.39 +// } else if(J2eeModule.EJBSERVICES_XML.equals(location)){
2.40 +// return getWebservices();
2.41 +// }
2.42 +// return null;
2.43 +// }
2.44 +//
2.45 + public <T> MetadataModel<T> getDeploymentDescriptor(Class<T> type) {
2.46 + if (type == EjbJarMetadata.class) {
2.47 +// return (MetadataModel<T>) project.getAPIEjbJar().getMetadataModel();
2.48 + throw new NotImplementedException();
2.49 + } else {
2.50 + // TODO MetadataModel: rewrite when MetadataModel<WebservicesMode> is ready
2.51 + // } else if (type == WebservicesMetadata.class) {
2.52 + // return getWebservices();
2.53 + throw new NotImplementedException();
2.54 }
2.55 - return null;
2.56 +// return null;
2.57 }
2.58
2.59 public String getUrl() {
2.60 @@ -87,8 +103,10 @@
2.61 }
2.62
2.63 public String getModuleVersion() {
2.64 - EjbJar ejbJar = getEjbJar();
2.65 - return ejbJar.getVersion().toString();
2.66 + // TODO MetadataModel: rewrite when MetadataModel is ready
2.67 +// EjbJar ejbJar = getEjbJar();
2.68 +// return ejbJar.getVersion().toString();
2.69 + throw new NotImplementedException();
2.70 }
2.71
2.72 public Object getModuleType() {
2.73 @@ -109,27 +127,28 @@
2.74
2.75 // private methods
2.76
2.77 - private EjbJar getEjbJar() {
2.78 - try {
2.79 - return DDProvider.getDefault().getMergedDDRoot(getEjbModule().getMetadataUnit());
2.80 - } catch (java.io.IOException e) {
2.81 - org.openide.ErrorManager.getDefault().log(e.getLocalizedMessage());
2.82 - }
2.83 - return null;
2.84 - }
2.85 -
2.86 - private Webservices getWebservices() {
2.87 - FileObject wsdd = getDD();
2.88 - if(wsdd != null) {
2.89 - try {
2.90 - return org.netbeans.modules.j2ee.dd.api.webservices.DDProvider.getDefault().getDDRoot(getDD());
2.91 - } catch (java.io.IOException e) {
2.92 - org.openide.ErrorManager.getDefault().log(e.getLocalizedMessage());
2.93 - }
2.94 - }
2.95 -
2.96 - return null;
2.97 - }
2.98 +// TODO MetadataModel: rewrite when MetadataModel is ready
2.99 +// private EjbJar getEjbJar() {
2.100 +// try {
2.101 +// return DDProvider.getDefault().getDDRoot(getEjbModule().getDeploymentDescriptor());
2.102 +// } catch (java.io.IOException e) {
2.103 +// org.openide.ErrorManager.getDefault().log(e.getLocalizedMessage());
2.104 +// }
2.105 +// return null;
2.106 +// }
2.107 +//
2.108 +// private Webservices getWebservices() {
2.109 +// FileObject wsdd = getDD();
2.110 +// if(wsdd != null) {
2.111 +// try {
2.112 +// return org.netbeans.modules.j2ee.dd.api.webservices.DDProvider.getDefault().getDDRoot(getDD());
2.113 +// } catch (java.io.IOException e) {
2.114 +// org.openide.ErrorManager.getDefault().log(e.getLocalizedMessage());
2.115 +// }
2.116 +// }
2.117 +//
2.118 +// return null;
2.119 +// }
2.120
2.121 public FileObject getDD() {
2.122 FileObject metaInfFo = getEjbModule().getMetaInf();
2.123 @@ -171,14 +190,15 @@
2.124 }
2.125
2.126 private PropertyChangeSupport getPropertyChangeSupport() {
2.127 - EjbJar ejbJar = getEjbJar();
2.128 +// TODO MetadataModel: rewrite when MetadataModel is ready
2.129 +// EjbJar ejbJar = getEjbJar();
2.130 synchronized (this) {
2.131 if (propertyChangeSupport == null) {
2.132 propertyChangeSupport = new PropertyChangeSupport(this);
2.133 - if (ejbJar != null) {
2.134 - PropertyChangeListener l = (PropertyChangeListener) WeakListeners.create(PropertyChangeListener.class, this, ejbJar);
2.135 - ejbJar.addPropertyChangeListener(l);
2.136 - }
2.137 +// if (ejbJar != null) {
2.138 +// PropertyChangeListener l = (PropertyChangeListener) WeakListeners.create(PropertyChangeListener.class, this, ejbJar);
2.139 +// ejbJar.addPropertyChangeListener(l);
2.140 +// }
2.141 }
2.142 return propertyChangeSupport;
2.143 }
3.1 --- a/j2ee.ejbfreeform/src/org/netbeans/modules/j2ee/ejbfreeform/EJBModules.java Fri Jun 01 13:58:28 2007 +0000
3.2 +++ b/j2ee.ejbfreeform/src/org/netbeans/modules/j2ee/ejbfreeform/EJBModules.java Fri Jun 01 14:59:48 2007 +0000
3.3 @@ -30,6 +30,7 @@
3.4 import java.util.Set;
3.5 import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
3.6 import org.netbeans.modules.j2ee.metadata.MetadataUnit;
3.7 +import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
3.8 import org.netbeans.modules.j2ee.spi.ejbjar.EjbJarFactory;
3.9 import org.netbeans.modules.j2ee.spi.ejbjar.EjbJarImplementation;
3.10 import org.netbeans.modules.j2ee.spi.ejbjar.EjbJarProvider;
3.11 @@ -291,8 +292,6 @@
3.12 private FileObject [] sourcesFOs;
3.13 private ClassPath classPath;
3.14 private String j2eeSpec;
3.15 - private MetadataUnit metadataUnit;
3.16 - private ClassPath metadataClassPath;
3.17 private File[] j2eePlatformClasspath;
3.18 // private String contextPath;
3.19
3.20 @@ -355,21 +354,11 @@
3.21 }
3.22
3.23 public MetadataUnit getMetadataUnit() {
3.24 - synchronized (this) {
3.25 - if (metadataUnit == null) {
3.26 - metadataUnit = new MetadataUnitImpl();
3.27 - }
3.28 - return metadataUnit;
3.29 - }
3.30 + return null;
3.31 }
3.32
3.33 - private class MetadataUnitImpl implements MetadataUnit {
3.34 - public ClassPath getClassPath() {
3.35 - return classPath;
3.36 - }
3.37 - public FileObject getDeploymentDescriptor() {
3.38 - return FFEJBModule.this.getDeploymentDescriptor();
3.39 - }
3.40 + public MetadataModel getMetadataModel() {
3.41 + throw new UnsupportedOperationException("Not supported yet.");
3.42 }
3.43
3.44 }
4.1 --- a/j2ee.ejbfreeform/src/org/netbeans/modules/j2ee/ejbfreeform/EJBProjectNature.java Fri Jun 01 13:58:28 2007 +0000
4.2 +++ b/j2ee.ejbfreeform/src/org/netbeans/modules/j2ee/ejbfreeform/EJBProjectNature.java Fri Jun 01 14:59:48 2007 +0000
4.3 @@ -19,23 +19,19 @@
4.4
4.5 package org.netbeans.modules.j2ee.ejbfreeform;
4.6
4.7 -import java.io.IOException;
4.8 import java.util.ArrayList;
4.9 import java.util.Arrays;
4.10 import java.util.HashSet;
4.11 import java.util.List;
4.12 import java.util.Set;
4.13 -import org.netbeans.api.java.classpath.ClassPath;
4.14 import org.netbeans.api.project.Project;
4.15 import org.netbeans.modules.ant.freeform.spi.ProjectNature;
4.16 import org.netbeans.modules.ant.freeform.spi.TargetDescriptor;
4.17 import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
4.18 -import org.netbeans.modules.j2ee.dd.api.ejb.DDProvider;
4.19 import org.netbeans.modules.j2ee.spi.ejbjar.support.J2eeProjectView;
4.20 import org.netbeans.spi.project.AuxiliaryConfiguration;
4.21 import org.netbeans.spi.project.support.ant.AntProjectHelper;
4.22 import org.netbeans.spi.project.support.ant.PropertyEvaluator;
4.23 -import org.openide.ErrorManager;
4.24 import org.openide.filesystems.FileObject;
4.25 import org.openide.filesystems.FileUtil;
4.26 import org.openide.loaders.DataObject;
4.27 @@ -92,15 +88,7 @@
4.28 } else if (style.equals(STYLE_EJBS)) {
4.29 EjbJar ejbJar = EjbJar.getEjbJar(folder);
4.30 assert ejbJar != null;
4.31 - FileObject ddFile = ejbJar.getDeploymentDescriptor();
4.32 - org.netbeans.modules.j2ee.dd.api.ejb.EjbJar model;
4.33 - try {
4.34 - model = DDProvider.getDefault().getMergedDDRoot(ejbJar.getMetadataUnit());
4.35 - ClassPath cp = org.netbeans.spi.java.classpath.support.ClassPathSupport.createClassPath(ejbJar.getJavaSources());
4.36 - return J2eeProjectView.createEjbsView(model, cp, ddFile, project);
4.37 - } catch (IOException ex) {
4.38 - ErrorManager.getDefault().notify(ex);
4.39 - }
4.40 + return J2eeProjectView.createEjbsView(ejbJar, project);
4.41 }
4.42 throw new IllegalArgumentException();
4.43 }
5.1 --- a/j2ee.ejbfreeform/src/org/netbeans/modules/j2ee/ejbfreeform/ui/NewEJBFreeformProjectWizardIterator.java Fri Jun 01 13:58:28 2007 +0000
5.2 +++ b/j2ee.ejbfreeform/src/org/netbeans/modules/j2ee/ejbfreeform/ui/NewEJBFreeformProjectWizardIterator.java Fri Jun 01 14:59:48 2007 +0000
5.3 @@ -115,7 +115,7 @@
5.4 org.netbeans.modules.j2ee.api.ejbjar.EjbJar ejbModule = org.netbeans.modules.j2ee.api.ejbjar.EjbJar.getEjbJars(p)[0];
5.5 if (ejbModule != null) {
5.6 FileObject ejbJarFile = ejbModule.getDeploymentDescriptor();
5.7 - EjbJar dd = DDProvider.getDefault().getMergedDDRoot(ejbModule.getMetadataUnit());
5.8 + EjbJar dd = DDProvider.getDefault().getDDRoot(ejbJarFile);
5.9 // #82897: putEJBNodeView() is called here because Enterprise Beans
5.10 // node is supposed to be shown only for non EJB 3.0 projects
5.11 if (!new BigDecimal(EjbJar.VERSION_3_0).equals(dd.getVersion())) {