adc 2004/01/18 13:14:35
Modified:
modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb
Entity.java MessageDriven.java Session.java
modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee
Security.java
Added:
modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee
BeanSecurity.java DefaultPrincipal.java
Log:
Additional deployment information
Revision Changes Path
1.8 +11 -1
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb/Entity.java
Index: Entity.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb/Entity.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Entity.java 19 Nov 2003 11:07:57 -0000 1.7
+++ Entity.java 18 Jan 2004 21:14:35 -0000 1.8
@@ -63,6 +63,7 @@
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.SecurityRoleRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ServiceRef;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.BeanSecurity;
/**
* JavaBean for the geronimo-ejb-jar.xml tag entity
@@ -73,6 +74,7 @@
private Query[] update;
private Query[] call;
+ private BeanSecurity beanSecurity;
public Entity() {
super.setSecurityRoleRef(new SecurityRoleRef[0]);
@@ -281,6 +283,14 @@
public Query getGeronimoQuery(int i) {
return (Query)super.getQuery(i);
+ }
+
+ public BeanSecurity getBeanSecurity() {
+ return beanSecurity;
+ }
+
+ public void setBeanSecurity(BeanSecurity beanSecurity) {
+ this.beanSecurity = beanSecurity;
}
public Query[] getUpdate() {
1.5 +11 -1
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb/MessageDriven.java
Index: MessageDriven.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb/MessageDriven.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MessageDriven.java 19 Nov 2003 00:33:59 -0000 1.4
+++ MessageDriven.java 18 Jan 2004 21:14:35 -0000 1.5
@@ -62,6 +62,7 @@
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ServiceRef;
import
org.apache.geronimo.deployment.model.geronimo.j2ee.JNDIEnvironmentRefs;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.BeanSecurity;
/**
* JavaBean for the geronimo-ejb-jar.xml tag message-driven
@@ -70,6 +71,8 @@
*/
public class MessageDriven extends
org.apache.geronimo.deployment.model.ejb.MessageDriven implements
JNDIEnvironmentRefs {
+ private BeanSecurity beanSecurity;
+
public MessageDriven() {
super.setEJBRef(new EjbRef[0]);
super.setEJBLocalRef(new EjbLocalRef[0]);
@@ -240,4 +243,11 @@
return (ActivationConfig) super.getActivationConfig();
}
+ public BeanSecurity getBeanSecurity() {
+ return beanSecurity;
+ }
+
+ public void setBeanSecurity(BeanSecurity beanSecurity) {
+ this.beanSecurity = beanSecurity;
+ }
}
1.6 +12 -1
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb/Session.java
Index: Session.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb/Session.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Session.java 18 Nov 2003 22:22:28 -0000 1.5
+++ Session.java 18 Jan 2004 21:14:35 -0000 1.6
@@ -63,6 +63,7 @@
import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceRef;
import org.apache.geronimo.deployment.model.geronimo.j2ee.ServiceRef;
import
org.apache.geronimo.deployment.model.geronimo.j2ee.JNDIEnvironmentRefs;
+import org.apache.geronimo.deployment.model.geronimo.j2ee.BeanSecurity;
/**
* JavaBean for the geronimo-ejb-jar.xml tag session
@@ -71,6 +72,8 @@
*/
public class Session extends
org.apache.geronimo.deployment.model.ejb.Session implements JNDIEnvironmentRefs
{
+ private BeanSecurity beanSecurity;
+
public Session() {
super.setSecurityRoleRef(new SecurityRoleRef[0]);
super.setEJBRef(new EjbRef[0]);
@@ -261,5 +264,13 @@
public void setGeronimoServiceRef(int i, ServiceRef ref) {
super.setServiceRef(i, ref);
+ }
+
+ public BeanSecurity getBeanSecurity() {
+ return beanSecurity;
+ }
+
+ public void setBeanSecurity(BeanSecurity beanSecurity) {
+ this.beanSecurity = beanSecurity;
}
}
1.2 +19 -1
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee/Security.java
Index: Security.java
===================================================================
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee/Security.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Security.java 18 Nov 2003 04:16:09 -0000 1.1
+++ Security.java 18 Jan 2004 21:14:35 -0000 1.2
@@ -64,7 +64,25 @@
* @version $Revision$ $Date$
*/
public class Security extends Describable {
+ private boolean useContextHandler;
+ private DefaultPrincipal defaultPrincipal;
private RoleMappings roleMappings = new RoleMappings();
+
+ public boolean useContextHandler() {
+ return useContextHandler;
+ }
+
+ public void setUseContextHandler(boolean useContextHandler) {
+ this.useContextHandler = useContextHandler;
+ }
+
+ public DefaultPrincipal getDefaultPrincipal() {
+ return defaultPrincipal;
+ }
+
+ public void setDefaultPrincipal(DefaultPrincipal defaultPrincipal) {
+ this.defaultPrincipal = defaultPrincipal;
+ }
public RoleMappings getRoleMappings() {
return roleMappings;
1.1
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee/BeanSecurity.java
Index: BeanSecurity.java
===================================================================
/* ====================================================================
* 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/>.
*
* ====================================================================
*/
package org.apache.geronimo.deployment.model.geronimo.j2ee;
import org.apache.geronimo.deployment.model.j2ee.Describable;
/**
* Security information that is specific to a particular bean is placed in
here.
* @version $Revision: 1.1 $ $Date: 2004/01/18 21:14:35 $
*/
public class BeanSecurity extends Describable {
private boolean useIdentity;
/**
* Perform the bean call as the caller's Subject
* @return true if the bean call is to be performed as the caller's
Subject
*/
public boolean useIdentity() {
return useIdentity;
}
/**
* Perform the bean call as the caller's Subject
* @param useIdentity true if the bean call is to be performed as the
caller's Subject
*/
public void setUseIdentity(boolean useIdentity) {
this.useIdentity = useIdentity;
}
}
1.1
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee/DefaultPrincipal.java
Index: DefaultPrincipal.java
===================================================================
/* ====================================================================
* 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/>.
*
* ====================================================================
*/
package org.apache.geronimo.deployment.model.geronimo.j2ee;
import org.apache.geronimo.deployment.model.j2ee.Describable;
/**
*
* @version $Revision: 1.1 $ $Date: 2004/01/18 21:14:35 $
*/
public class DefaultPrincipal extends Describable {
private String realmName;
private Principal principal;
public String getRealmName() {
return realmName;
}
public void setRealmName(String realmName) {
this.realmName = realmName;
}
public Principal getPrincipal() {
return principal;
}
public void setPrincipal(Principal principal) {
this.principal = principal;
}
}
