You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/12/10 00:28:17 UTC
svn commit: r355645 - in /geronimo/branches/1.0: applications/daytrader/ear/
applications/daytrader/ejb/src/java/org/apache/geronimo/samples/daytrader/util/
assemblies/j2ee-jetty-server/ assemblies/j2ee-jetty-server/src/var/config/
assemblies/j2ee-jett...
Author: ammulder
Date: Fri Dec 9 15:28:02 2005
New Revision: 355645
URL: http://svn.apache.org/viewcvs?rev=355645&view=rev
Log:
Merge my recent HEAD changes to the branch
Added:
geronimo/branches/1.0/configs/jmxdebug-jetty/
- copied from r355637, geronimo/trunk/configs/jmxdebug-jetty/
geronimo/branches/1.0/configs/jmxdebug-jetty/LICENSE.txt
- copied unchanged from r355637, geronimo/trunk/configs/jmxdebug-jetty/LICENSE.txt
geronimo/branches/1.0/configs/jmxdebug-jetty/NOTICE.txt
- copied unchanged from r355637, geronimo/trunk/configs/jmxdebug-jetty/NOTICE.txt
geronimo/branches/1.0/configs/jmxdebug-jetty/maven.xml
- copied unchanged from r355637, geronimo/trunk/configs/jmxdebug-jetty/maven.xml
geronimo/branches/1.0/configs/jmxdebug-jetty/project.properties
- copied unchanged from r355637, geronimo/trunk/configs/jmxdebug-jetty/project.properties
geronimo/branches/1.0/configs/jmxdebug-jetty/project.xml
- copied unchanged from r355637, geronimo/trunk/configs/jmxdebug-jetty/project.xml
geronimo/branches/1.0/configs/jmxdebug-jetty/src/
- copied from r355637, geronimo/trunk/configs/jmxdebug-jetty/src/
geronimo/branches/1.0/configs/jmxdebug-jetty/src/plan/
- copied from r355637, geronimo/trunk/configs/jmxdebug-jetty/src/plan/
geronimo/branches/1.0/configs/jmxdebug-jetty/src/plan/plan.xml
- copied unchanged from r355637, geronimo/trunk/configs/jmxdebug-jetty/src/plan/plan.xml
geronimo/branches/1.0/configs/jmxdebug-tomcat/
- copied from r355637, geronimo/trunk/configs/jmxdebug-tomcat/
geronimo/branches/1.0/configs/jmxdebug-tomcat/LICENSE.txt
- copied unchanged from r355637, geronimo/trunk/configs/jmxdebug-tomcat/LICENSE.txt
geronimo/branches/1.0/configs/jmxdebug-tomcat/NOTICE.txt
- copied unchanged from r355637, geronimo/trunk/configs/jmxdebug-tomcat/NOTICE.txt
geronimo/branches/1.0/configs/jmxdebug-tomcat/maven.xml
- copied unchanged from r355637, geronimo/trunk/configs/jmxdebug-tomcat/maven.xml
geronimo/branches/1.0/configs/jmxdebug-tomcat/project.properties
- copied unchanged from r355637, geronimo/trunk/configs/jmxdebug-tomcat/project.properties
geronimo/branches/1.0/configs/jmxdebug-tomcat/project.xml
- copied unchanged from r355637, geronimo/trunk/configs/jmxdebug-tomcat/project.xml
geronimo/branches/1.0/configs/jmxdebug-tomcat/src/
- copied from r355637, geronimo/trunk/configs/jmxdebug-tomcat/src/
geronimo/branches/1.0/configs/jmxdebug-tomcat/src/plan/
- copied from r355637, geronimo/trunk/configs/jmxdebug-tomcat/src/plan/
geronimo/branches/1.0/configs/jmxdebug-tomcat/src/plan/plan.xml
- copied unchanged from r355637, geronimo/trunk/configs/jmxdebug-tomcat/src/plan/plan.xml
Modified:
geronimo/branches/1.0/applications/daytrader/ear/project.xml
geronimo/branches/1.0/applications/daytrader/ejb/src/java/org/apache/geronimo/samples/daytrader/util/Log.java
geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml
geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml
geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties
geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml
geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml
geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties
geronimo/branches/1.0/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
geronimo/branches/1.0/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java
Modified: geronimo/branches/1.0/applications/daytrader/ear/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/ear/project.xml?rev=355645&r1=355644&r2=355645&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/ear/project.xml (original)
+++ geronimo/branches/1.0/applications/daytrader/ear/project.xml Fri Dec 9 15:28:02 2005
@@ -8,6 +8,16 @@
<package>org.apache.geronimo.samples.daytrader.ejb</package>
<description>Day Trader Enterprise Archive</description>
<dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons_logging_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j_version}</version>
+ </dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>daytrader-core</artifactId>
Modified: geronimo/branches/1.0/applications/daytrader/ejb/src/java/org/apache/geronimo/samples/daytrader/util/Log.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/daytrader/ejb/src/java/org/apache/geronimo/samples/daytrader/util/Log.java?rev=355645&r1=355644&r2=355645&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/daytrader/ejb/src/java/org/apache/geronimo/samples/daytrader/util/Log.java (original)
+++ geronimo/branches/1.0/applications/daytrader/ejb/src/java/org/apache/geronimo/samples/daytrader/util/Log.java Fri Dec 9 15:28:02 2005
@@ -19,20 +19,16 @@
import java.util.Collection;
import java.util.Iterator;
+import org.apache.commons.logging.*;
import org.apache.geronimo.samples.daytrader.*;
public class Log {
-
+ private final static org.apache.commons.logging.Log log = LogFactory.getLog(Log.class);
//A general purpose, high performance logging, tracing, statistic service
- private static void logInternal(String message)
- {
- System.out.println(message);
- }
-
+
public static void log(String message)
{
- logInternal("TradeLog:" + new java.util.Date() + "------\n\t ");
- logInternal(message);
+ log.debug(message);
}
public static void log(String msg1, String msg2)
{
@@ -46,7 +42,7 @@
public static void error(String message)
{
message = "Error: " + message;
- log(message);
+ log.error(message);
}
public static void error(String message, Throwable e)
{
@@ -78,7 +74,7 @@
public static void trace(String message)
{
- log(message + " threadID="+ Thread.currentThread());
+ log.trace(message + " threadID="+ Thread.currentThread());
}
public static void trace(String message, Object parm1)
@@ -115,11 +111,11 @@
}
public static void traceEnter(String message)
{
- log("Method enter --" + message);
+ log.trace("Method enter --" + message);
}
public static void traceExit(String message)
{
- log("Method exit --" + message);
+ log.trace("Method exit --" + message);
}
@@ -130,12 +126,12 @@
public static void debug(String message)
{
- log(message);
+ log.debug(message);
}
public static void print(String message)
{
- logInternal(message);
+ log(message);
}
public static void printObject(Object o)
@@ -149,7 +145,7 @@
Iterator it = c.iterator();
while ( it.hasNext() )
{
- logInternal("\t\t"+it.next().toString());
+ log("\t\t"+it.next().toString());
}
log("\t---Log.printCollection -- complete");
}
Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml?rev=355645&r1=355644&r2=355645&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/project.xml Fri Dec 9 15:28:02 2005
@@ -239,6 +239,15 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>jmxdebug-jetty</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>install</geronimo.assemble>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>uddi-jetty</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=355645&r1=355644&r2=355645&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/config/config.xml Fri Dec 9 15:28:02 2005
@@ -88,5 +88,6 @@
<configuration name="geronimo/jsp-examples-jetty/${pom.currentVersion}/car"/>
<configuration name="geronimo/webconsole-jetty/${pom.currentVersion}/car"/>
<configuration name="geronimo/uddi-jetty/${pom.currentVersion}/car"/>
+ <configuration name="geronimo/jmxdebug-jetty/${pom.currentVersion}/car"/>
<configuration name="geronimo/daytrader-derby-jetty/${pom.currentVersion}/car"/>
</attributes>
Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties?rev=355645&r1=355644&r2=355645&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties (original)
+++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties Fri Dec 9 15:28:02 2005
@@ -57,6 +57,7 @@
log4j.category.org.apache.jasper.compiler.SmapUtil=WARN
# ActiveMQ
+log4j.category.org.activemq.ActiveMQConnection=WARN
log4j.category.org.activemq.store.jdbc.adapter.DefaultJDBCAdapter=WARN
log4j.category.org.activemq.store.jdbc.JDBCPersistenceAdapter=WARN
log4j.category.org.activemq.store.journal.JournalPersistenceAdapter=WARN
@@ -73,10 +74,12 @@
# Various Jetty startup/shutdown output
log4j.category.org.mortbay.http.HttpServer=WARN
log4j.category.org.mortbay.http.SocketListener=WARN
+log4j.category.org.mortbay.http.ajp.AJP13Listener=WARN
log4j.category.org.mortbay.util.Container=WARN
log4j.category.org.mortbay.util.Credential=WARN
log4j.category.org.mortbay.util.ThreadedServer=WARN
log4j.category.org.mortbay.jetty.servlet.WebApplicationContext=WARN
+log4j.category.org.mortbay.jetty.context=WARN
# Various Tomcat startup output
log4j.category.org.apache.catalina.realm.JAASRealm=WARN
Modified: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml?rev=355645&r1=355644&r2=355645&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/project.xml Fri Dec 9 15:28:02 2005
@@ -239,6 +239,15 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
+ <artifactId>jmxdebug-tomcat</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>install</geronimo.assemble>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
<artifactId>uddi-tomcat</artifactId>
<type>car</type>
<version>${pom.currentVersion}</version>
Modified: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=355645&r1=355644&r2=355645&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/config/config.xml Fri Dec 9 15:28:02 2005
@@ -94,5 +94,6 @@
<configuration name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car"/>
<configuration name="geronimo/webconsole-tomcat/${pom.currentVersion}/car"/>
<configuration name="geronimo/uddi-tomcat/${pom.currentVersion}/car"/>
+ <configuration name="geronimo/jmxdebug-tomcat/${pom.currentVersion}/car"/>
<configuration name="geronimo/daytrader-derby-tomcat/${pom.currentVersion}/car"/>
</attributes>
Modified: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties?rev=355645&r1=355644&r2=355645&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties (original)
+++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties Fri Dec 9 15:28:02 2005
@@ -57,6 +57,7 @@
log4j.category.org.apache.jasper.compiler.SmapUtil=WARN
# ActiveMQ
+log4j.category.org.activemq.ActiveMQConnection=WARN
log4j.category.org.activemq.store.jdbc.adapter.DefaultJDBCAdapter=WARN
log4j.category.org.activemq.store.jdbc.JDBCPersistenceAdapter=WARN
log4j.category.org.activemq.store.journal.JournalPersistenceAdapter=WARN
@@ -73,10 +74,12 @@
# Various Jetty startup/shutdown output
log4j.category.org.mortbay.http.HttpServer=WARN
log4j.category.org.mortbay.http.SocketListener=WARN
+log4j.category.org.mortbay.http.ajp.AJP13Listener=WARN
log4j.category.org.mortbay.util.Container=WARN
log4j.category.org.mortbay.util.Credential=WARN
log4j.category.org.mortbay.util.ThreadedServer=WARN
log4j.category.org.mortbay.jetty.servlet.WebApplicationContext=WARN
+log4j.category.org.mortbay.jetty.context=WARN
# Various Tomcat startup output
log4j.category.org.apache.catalina.realm.JAASRealm=WARN
Modified: geronimo/branches/1.0/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=355645&r1=355644&r2=355645&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/branches/1.0/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java Fri Dec 9 15:28:02 2005
@@ -696,4 +696,7 @@
return config;
}
+ public Object getAttribute(ObjectName name, String property) throws Exception {
+ return kernel.getAttribute(name, property);
+ }
}
Modified: geronimo/branches/1.0/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java?rev=355645&r1=355644&r2=355645&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java (original)
+++ geronimo/branches/1.0/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java Fri Dec 9 15:28:02 2005
@@ -16,15 +16,6 @@
*/
package org.apache.geronimo.security.deployment;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Properties;
-import java.util.Set;
-import java.util.List;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.deployment.service.XmlReferenceBuilder;
@@ -44,6 +35,16 @@
import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlOptions;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
/**
* @version $Rev$ $Date$
*/
@@ -65,6 +66,7 @@
}
XmlCursor xmlCursor = loginConfig.newCursor();
List uses = new ArrayList();
+ Set loginModuleNames = new HashSet();
try {
boolean atStart = true;
while ((atStart && xmlCursor.toFirstChild()) || (!atStart && xmlCursor.toNextSibling())) {
@@ -90,6 +92,16 @@
} catch (MalformedObjectNameException e) {
throw new DeploymentException("cannot construct login module name from parts,", e);
}
+ try {
+ String loginDomain = (String) context.getAttribute(loginModuleName, "loginDomainName");
+ if(!loginModuleNames.add(loginDomain)) {
+ throw new DeploymentException("Security realm contains two login domains called '"+loginDomain+"'");
+ }
+ } catch(DeploymentException e) {
+ throw e;
+ } catch(Exception e) {
+ throw new DeploymentException("Unable to create reference to login module "+name, e);
+ }
} else if (abstractLoginModule instanceof GerLoginModuleType) {
//create the LoginModuleGBean also
name = null;
@@ -97,6 +109,9 @@
GerLoginModuleType loginModule = (GerLoginModuleType) abstractLoginModule;
name = trim(loginModule.getLoginDomainName());
+ if(!loginModuleNames.add(name)) {
+ throw new DeploymentException("Security realm contains two login domains called '"+name+"'");
+ }
String className = trim(loginModule.getLoginModuleClass());
boolean serverSide = loginModule.getServerSide();
Properties options = new Properties();