Thanks to the apiComparator plugin for IDEA:
- upgraded to latest spec
- final + private constructor for DeploymentFactoryManager
- added missing @deprecated tag
- parameter names
Maas
Attached: patch + NEW file.
Index: incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/DDBean.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/DDBean.java,v
retrieving revision 1.1
diff -u -r1.1 DDBean.java
--- incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/DDBean.java 14 Aug 2003 16:12:51 -0000 1.1
+++ incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/DDBean.java 15 Aug 2003 23:02:07 -0000
@@ -75,4 +75,8 @@
public void addXpathListener(String xpath, XpathListener xpl);
public void removeXpathListener(String xpath, XpathListener xpl);
+
+ public String[] getAttributeNames();
+
+ public String getAttributeValue(String attrName);
}
Index: incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/DDBeanRoot.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/DDBeanRoot.java,v
retrieving revision 1.1
diff -u -r1.1 DDBeanRoot.java
--- incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/DDBeanRoot.java 14 Aug 2003 16:12:51 -0000 1.1
+++ incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/DDBeanRoot.java 15 Aug 2003 23:02:07 -0000
@@ -66,7 +66,14 @@
public DeployableObject getDeployableObject();
+ /**
+ * @deprecated
+ */
public String getModuleDTDVersion();
+ public String getDDBeanRootVersion();
+
public String getXpath();
+
+ public String getFilename();
}
Index: incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/DeployableObject.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/DeployableObject.java,v
retrieving revision 1.1
diff -u -r1.1 DeployableObject.java
--- incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/DeployableObject.java 14 Aug 2003 16:12:51 -0000 1.1
+++ incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/DeployableObject.java 15 Aug 2003 23:02:08 -0000
@@ -59,7 +59,11 @@
*/
package javax.enterprise.deploy.model;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.util.Enumeration;
import javax.enterprise.deploy.shared.ModuleType;
+import javax.enterprise.deploy.model.exceptions.DDBeanCreateException;
public interface DeployableObject {
public ModuleType getType();
@@ -71,4 +75,15 @@
public String[] getText(String xpath);
public Class getClassFromScope(String className);
+
+ /**
+ * @deprecated
+ */
+ public String getModuleDTDVersion();
+
+ public DDBeanRoot getDDBeanRoot(String filename) throws FileNotFoundException, DDBeanCreateException;
+
+ public Enumeration entries();
+
+ public InputStream getEntry(String name);
}
Index: incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/XpathEvent.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/XpathEvent.java,v
retrieving revision 1.1
diff -u -r1.1 XpathEvent.java
--- incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/XpathEvent.java 14 Aug 2003 16:12:51 -0000 1.1
+++ incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/model/XpathEvent.java 15 Aug 2003 23:02:08 -0000
@@ -71,9 +71,9 @@
private DDBean bean;
private Object type;
- public XpathEvent(DDBean bean, Object type) {
+ public XpathEvent(DDBean bean, Object typ) {
this.bean = bean;
- this.type = type;
+ this.type = typ;
}
public PropertyChangeEvent getChangeEvent() {
Index: incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/shared/factories/DeploymentFactoryManager.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/shared/factories/DeploymentFactoryManager.java,v
retrieving revision 1.1
diff -u -r1.1 DeploymentFactoryManager.java
--- incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/shared/factories/DeploymentFactoryManager.java 14 Aug 2003 16:12:52 -0000 1.1
+++ incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/shared/factories/DeploymentFactoryManager.java 15 Aug 2003 23:02:08 -0000
@@ -65,11 +65,14 @@
import java.util.Iterator;
import java.util.ArrayList;
-public class DeploymentFactoryManager {
+public final class DeploymentFactoryManager {
private static DeploymentFactoryManager instance;
private ArrayList deploymentFactories = new ArrayList();
+ private DeploymentFactoryManager() {
+ }
+
public static DeploymentFactoryManager getInstance() {
if (instance == null) {
instance = new DeploymentFactoryManager();
@@ -77,13 +80,6 @@
return instance;
}
- public void registerDeploymentFactory(DeploymentFactory factory) {
- // apparently we dont care about null values, the Sun RI even adds the null
- // to the list. So after registerDeploymentFactory(null) getDeploymentFactories()
- // return an array with length 1.
- deploymentFactories.add(factory);
- }
-
public DeploymentFactory[] getDeploymentFactories() {
return (DeploymentFactory[]) deploymentFactories.toArray(new DeploymentFactory[]{});
}
@@ -105,6 +101,13 @@
}
}
throw new DeploymentManagerCreationException("Could not get DeploymentManager");
+ }
+
+ public void registerDeploymentFactory(DeploymentFactory factory) {
+ // apparently we dont care about null values, the Sun RI even adds the null
+ // to the list. So after registerDeploymentFactory(null) getDeploymentFactories()
+ // return an array with length 1.
+ deploymentFactories.add(factory);
}
public DeploymentManager getDisconnectedDeploymentManager(String uri) throws DeploymentManagerCreationException {
Index: incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/spi/DConfigBeanRoot.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/spi/DConfigBeanRoot.java,v
retrieving revision 1.1
diff -u -r1.1 DConfigBeanRoot.java
--- incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/spi/DConfigBeanRoot.java 14 Aug 2003 16:12:52 -0000 1.1
+++ incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/spi/DConfigBeanRoot.java 15 Aug 2003 23:02:09 -0000
@@ -59,5 +59,8 @@
*/
package javax.enterprise.deploy.spi;
+import javax.enterprise.deploy.model.DDBeanRoot;
+
public interface DConfigBeanRoot extends DConfigBean {
+ public DConfigBean getDConfigBean(DDBeanRoot ddBeanRoot);
}
Index: incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/spi/exceptions/ClientExecuteException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/spi/exceptions/ClientExecuteException.java,v
retrieving revision 1.1
diff -u -r1.1 ClientExecuteException.java
--- incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/spi/exceptions/ClientExecuteException.java 14 Aug 2003 16:12:52 -0000 1.1
+++ incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/spi/exceptions/ClientExecuteException.java 15 Aug 2003 23:02:09 -0000
@@ -61,9 +61,10 @@
public class ClientExecuteException extends Exception {
public ClientExecuteException() {
+ super();
}
- public ClientExecuteException(String msh) {
- super(msh);
+ public ClientExecuteException(String msg) {
+ super(msg);
}
}
Index: incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/spi/exceptions/ConfigurationException.java
===================================================================
RCS file: /home/cvspublic/incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/spi/exceptions/ConfigurationException.java,v
retrieving revision 1.1
diff -u -r1.1 ConfigurationException.java
--- incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/spi/exceptions/ConfigurationException.java 14 Aug 2003 16:12:52 -0000 1.1
+++ incubator-geronimo/specs/jsr88/src/java/javax/enterprise/deploy/spi/exceptions/ConfigurationException.java 15 Aug 2003 23:02:09 -0000
@@ -61,6 +61,7 @@
public class ConfigurationException extends Exception {
public ConfigurationException() {
+ super();
}
public ConfigurationException(String msg) {
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Geronimo" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Geronimo", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* ====================================================================
*/
//
// This source code implements specifications defined by the Java
// Community Process. In order to remain compliant with the specification
// DO NOT add / change / or delete method signatures!
//package javax.enterprise.deploy.exceptions;
package javax.enterprise.deploy.model.exceptions;
/**
*
*
*
* @version $Revision$
*/
public class DDBeanCreateException extends Exception {
public DDBeanCreateException() {
super();
}
public DDBeanCreateException(String msg) {
super(msg);
}
}
