Finals and format
diff --git a/pom.xml b/pom.xml
index 5aa9087..27eb0a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,8 +95,8 @@
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>5.4.3</version>
+ <artifactId>activemq-client</artifactId>
+ <version>5.10.0</version>
</dependency>
<dependency>
@@ -708,7 +708,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.3.1</version>
+ <version>1.2.1</version>
<executions>
<execution>
<id>start-database</id>
@@ -765,7 +765,7 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-client</artifactId>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
</artifactItem>
<artifactItem>
@@ -936,17 +936,17 @@
<repositories>
<!--<repository>-->
- <!--<id>nexus-staging</id>-->
- <!--<name>Nexus Staging Repository</name>-->
- <!--<url>https://repository.apache.org/content/repositories/orgapachetomee-1036</url>-->
- <!--<layout>default</layout>-->
- <!--<snapshots>-->
- <!--<enabled>false</enabled>-->
- <!--</snapshots>-->
- <!--<releases>-->
- <!--<enabled>true</enabled>-->
- <!--<checksumPolicy>ignore</checksumPolicy>-->
- <!--</releases>-->
+ <!--<id>nexus-staging</id>-->
+ <!--<name>Nexus Staging Repository</name>-->
+ <!--<url>https://repository.apache.org/content/repositories/orgapachetomee-1036</url>-->
+ <!--<layout>default</layout>-->
+ <!--<snapshots>-->
+ <!--<enabled>false</enabled>-->
+ <!--</snapshots>-->
+ <!--<releases>-->
+ <!--<enabled>true</enabled>-->
+ <!--<checksumPolicy>ignore</checksumPolicy>-->
+ <!--</releases>-->
<!--</repository>-->
<repository>
@@ -977,17 +977,17 @@
<pluginRepositories>
<!--<pluginRepository>-->
- <!--<id>nexus-staging-plugin</id>-->
- <!--<name>Nexus Staging Repository</name>-->
- <!--<url>https://repository.apache.org/content/repositories/orgapachetomee-1036</url>-->
- <!--<layout>default</layout>-->
- <!--<snapshots>-->
- <!--<enabled>false</enabled>-->
- <!--</snapshots>-->
- <!--<releases>-->
- <!--<enabled>true</enabled>-->
- <!--<checksumPolicy>ignore</checksumPolicy>-->
- <!--</releases>-->
+ <!--<id>nexus-staging-plugin</id>-->
+ <!--<name>Nexus Staging Repository</name>-->
+ <!--<url>https://repository.apache.org/content/repositories/orgapachetomee-1036</url>-->
+ <!--<layout>default</layout>-->
+ <!--<snapshots>-->
+ <!--<enabled>false</enabled>-->
+ <!--</snapshots>-->
+ <!--<releases>-->
+ <!--<enabled>true</enabled>-->
+ <!--<checksumPolicy>ignore</checksumPolicy>-->
+ <!--</releases>-->
<!--</pluginRepository>-->
<pluginRepository>
<id>codehaus-snapshots</id>
diff --git a/src/main/java/org/apache/openejb/cts/DeploymentImpl.java b/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
index 120ccd9..991230a 100644
--- a/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
+++ b/src/main/java/org/apache/openejb/cts/DeploymentImpl.java
@@ -53,7 +53,7 @@
// System.setProperty("java.opts", "-Xmx128m -XX:MaxPermSize=128m");
// System.setProperty("java.opts", "-XX:MaxPermSize=64m");
// System.setProperty("openejb.server.profile", "true");
- System.setProperty("java.opts", "-Dopenejb.deployer.jndiname=openejb/WebappDeployerRemote");
+ System.setProperty("java.opts", "-Dopenejb.deployer.jndiname=openejb/WebappDeployerRemote");
final RemoteServer remoteServer = new RemoteServer(250, true);
// remoteServer.start(Arrays.asList("-Xmx128m", "-XX:MaxPermSize=128m"), "start", true);
// remoteServer.start(Arrays.asList("-Djava.util.logging.config.file=/logging.properties"), "start", true);
@@ -70,82 +70,82 @@
private File appsDir;
private File libDir;
- public void init(PrintWriter log) {
+ public void init(final PrintWriter log) {
this.log = log;
PropertyManagerInterface propMgr = null;
try {
propMgr = DeliverableFactory.getDeliverableInstance().getPropertyManager();
- String openejbHomeName = propMgr.getProperty("openejb.home");
+ final String openejbHomeName = propMgr.getProperty("openejb.home");
if (openejbHomeName == null) {
throw new IllegalStateException("Not initialized; missing property: geronimo.porting.planDir");
}
- File openejbHome = new File(openejbHomeName).getCanonicalFile();
+ final File openejbHome = new File(openejbHomeName).getCanonicalFile();
System.setProperty("openejb.home", openejbHome.getAbsolutePath());
appsDir = new File(openejbHome, "apps");
libDir = new File(openejbHome, "lib");
try {
- String openejbUri = propMgr.getProperty("openejb.server.uri");
+ final String openejbUri = propMgr.getProperty("openejb.server.uri");
System.setProperty("openejb.uri", openejbUri);
- } catch (PropertyNotSetException e) {
+ } catch (final PropertyNotSetException e) {
}
try {
- String value = propMgr.getProperty("ts.run.classpath");
+ final String value = propMgr.getProperty("ts.run.classpath");
System.setProperty("ts.run.classpath", value);
- } catch (PropertyNotSetException e) {
+ } catch (final PropertyNotSetException e) {
}
this.log.println(HEAD + "Initialized Deployment helper");
- } catch (Exception e) {
+ } catch (final Exception e) {
this.log.println(HEAD + "ERROR initializing DeploymentImpl");
e.printStackTrace(this.log);
throw new AssertionError(e);
}
}
- public Hashtable getDependentValues(DeploymentInfo[] infoArray) {
+ public Hashtable getDependentValues(final DeploymentInfo[] infoArray) {
return new Hashtable();
}
- public InputStream getDeploymentPlan(DeploymentInfo info) throws TSDeploymentException {
- String earPath = info.getEarFile();
+ public InputStream getDeploymentPlan(final DeploymentInfo info) throws TSDeploymentException {
+ final String earPath = info.getEarFile();
if (earPath == null) {
throw new TSDeploymentException("EarFile is null");
}
log.println(HEAD + "module: " + earPath);
- Properties properties = new Properties();
+ final Properties properties = new Properties();
properties.put(FILENAME, earPath);
- Set<String> moduleIds = new TreeSet<String>();
+ final Set<String> moduleIds = new TreeSet<String>();
moduleIds.addAll(info.getWebRuntimeData().keySet());
moduleIds.addAll(info.getEjbRuntimeData().keySet());
moduleIds.addAll(info.getAppRuntimeData().keySet());
moduleIds.addAll(info.getAppClientRuntimeData().keySet());
- for (String path : info.getRuntimeFiles()) {
- String earName = earName(path, earPath);
+ for (final String path : info.getRuntimeFiles()) {
+ final String earName = earName(path, earPath);
if (earName != null && path.contains(earName)) {
- String name = path.substring(path.indexOf(earName) + earName.length() + 1);
+ final String name = path.substring(path.indexOf(earName) + earName.length() + 1);
properties.put(ALT_DD + "/" + name, path);
} else {
- String fileName = new File(path).getName();
- for (String moduleId : moduleIds) {
+ final String fileName = new File(path).getName();
+ for (final String moduleId : moduleIds) {
if (fileName.startsWith(moduleId)) {
- String name = fileName.substring(moduleId.length() + 1);
+ final String name = fileName.substring(moduleId.length() + 1);
properties.put(ALT_DD + "/" + moduleId + "/" + name, path);
}
}
}
}
- ByteArrayOutputStream out = new ByteArrayOutputStream();
+ final ByteArrayOutputStream out = new ByteArrayOutputStream();
try {
properties.store(out, "Auto Generated Deployment Plan");
- } catch (IOException e) {
+ } catch (final IOException e) {
throw new TSDeploymentException("Unable to create deployment plan", e);
}
return new ByteArrayInputStream(out.toByteArray());
@@ -170,20 +170,20 @@
return null;
}
- public Target[] getTargetsToUse(Target[] targets, DeploymentInfo info) {
+ public Target[] getTargetsToUse(final Target[] targets, final DeploymentInfo info) {
return new Target[]{targets[0]};
}
- public String getAppClientArgs(Properties p) {
- String executeArgs = p.getProperty("executeArgs");
- String clientname = p.getProperty("client_name");
+ public String getAppClientArgs(final Properties p) {
+ final String executeArgs = p.getProperty("executeArgs");
+ final String clientname = p.getProperty("client_name");
String earFile = p.getProperty("ear_file");
earFile = new File(earFile).getName();
earFile = earFile.substring(0, earFile.lastIndexOf('.'));
- File appClientJar = new File(new File(appsDir, earFile), clientname + ".jar");
+ final File appClientJar = new File(new File(appsDir, earFile), clientname + ".jar");
String classPath = appClientJar.getAbsolutePath();
- String property = System.getProperty("ts.run.classpath");
+ final String property = System.getProperty("ts.run.classpath");
classPath += PATH_SEP + property;
// for (int i = 0; i < libDir.listFiles().length; i++) {
@@ -241,27 +241,27 @@
return "-cp " + classPath + " -Dopenejb.client.moduleId=" + clientname + " " + CLIENT_MAIN + " " + executeArgs;
}
- public String getClientClassPath(TargetModuleID[] targetIDs, DeploymentInfo info, DeploymentManager manager) throws TSDeploymentException {
+ public String getClientClassPath(final TargetModuleID[] targetIDs, final DeploymentInfo info, final DeploymentManager manager) throws TSDeploymentException {
return "";
}
- public void createConnectionFactory(TargetModuleID[] targetIDs, Properties p) throws TSDeploymentException {
+ public void createConnectionFactory(final TargetModuleID[] targetIDs, final Properties p) throws TSDeploymentException {
}
- public void removeConnectionFactory(TargetModuleID[] targetIDs, Properties p) throws TSDeploymentException {
+ public void removeConnectionFactory(final TargetModuleID[] targetIDs, final Properties p) throws TSDeploymentException {
}
- public void postDistribute(ProgressObject po) {
- TargetModuleID moduleID = po.getResultTargetModuleIDs()[0];
+ public void postDistribute(final ProgressObject po) {
+ final TargetModuleID moduleID = po.getResultTargetModuleIDs()[0];
log.println(HEAD + "Distribute returned moduleID " + moduleID.getModuleID());
}
- public void postStart(ProgressObject po) {
+ public void postStart(final ProgressObject po) {
}
- public void postStop(ProgressObject po) {
+ public void postStop(final ProgressObject po) {
}
- public void postUndeploy(ProgressObject po) {
+ public void postUndeploy(final ProgressObject po) {
}
}
diff --git a/src/main/java/org/apache/openejb/cts/DerbyRunner.java b/src/main/java/org/apache/openejb/cts/DerbyRunner.java
index 4bdfa9f..99aa2dd 100644
--- a/src/main/java/org/apache/openejb/cts/DerbyRunner.java
+++ b/src/main/java/org/apache/openejb/cts/DerbyRunner.java
@@ -25,52 +25,52 @@
public class DerbyRunner {
- private static class DerbyThread extends Thread {
- private static Logger log = Logger.getLogger(DerbyRunner.class);
- private static final int SLEEP_INTERVAL = 60000;
- private NetworkServerControl serverControl;
+ private static class DerbyThread extends Thread {
+ private static final Logger log = Logger.getLogger(DerbyRunner.class);
+ private static final int SLEEP_INTERVAL = 60000;
+ private NetworkServerControl serverControl;
private int port = NetworkServerControl.DEFAULT_PORTNUMBER;
- public DerbyThread (int derbyPort) {
+ public DerbyThread(final int derbyPort) {
port = derbyPort;
}
- public void run() {
- System.out.println("Starting embedded Derby database on port " + port);
- try {
- serverControl = new NetworkServerControl(InetAddress.getByAddress(new byte[] {127, 0, 0, 1}), port);
- serverControl.start(new Log4jPrintWriter("Derby", Level.INFO));
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- while(true) {
- try {
- Thread.sleep(SLEEP_INTERVAL);
- } catch (InterruptedException e) {
- break;
- }
- }
-
- System.out.println("Embedded database thread stopping");
- }
-
- }
-
-
- public static void main(String[] args) {
+ public void run() {
+ System.out.println("Starting embedded Derby database on port " + port);
+ try {
+ serverControl = new NetworkServerControl(InetAddress.getByAddress(new byte[]{127, 0, 0, 1}), port);
+ serverControl.start(new Log4jPrintWriter("Derby", Level.INFO));
+ } catch (final Exception e) {
+ e.printStackTrace();
+ }
+
+ while (true) {
+ try {
+ Thread.sleep(SLEEP_INTERVAL);
+ } catch (final InterruptedException e) {
+ break;
+ }
+ }
+
+ System.out.println("Embedded database thread stopping");
+ }
+
+ }
+
+
+ public static void main(final String[] args) {
int port = NetworkServerControl.DEFAULT_PORTNUMBER;
if (args.length == 1) {
try {
port = Integer.parseInt(args[0]);
//System.setProperty("derby.drda.portNumber", Integer.toString(port));
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
System.out.println("Could not convert port " + args[0] + ". Using the default " + port);
}
}
- DerbyThread thread = new DerbyThread(port);
+ final DerbyThread thread = new DerbyThread(port);
thread.setDaemon(true);
- thread.setName("DerbyServerDaemon");
- thread.start();
- }
+ thread.setName("DerbyServerDaemon");
+ thread.start();
+ }
}
diff --git a/src/main/java/org/apache/openejb/cts/DriverManagerXADataSource.java b/src/main/java/org/apache/openejb/cts/DriverManagerXADataSource.java
index d5e391e..2142448 100644
--- a/src/main/java/org/apache/openejb/cts/DriverManagerXADataSource.java
+++ b/src/main/java/org/apache/openejb/cts/DriverManagerXADataSource.java
@@ -18,10 +18,9 @@
package org.apache.openejb.cts;
import javax.sql.ConnectionEventListener;
-//import javax.sql.StatementEventListener;
+import javax.sql.StatementEventListener;
import javax.sql.XAConnection;
import javax.sql.XADataSource;
-import javax.sql.StatementEventListener;
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
@@ -32,6 +31,8 @@
import java.sql.SQLFeatureNotSupportedException;
import java.util.logging.Logger;
+//import javax.sql.StatementEventListener;
+
public class DriverManagerXADataSource implements XADataSource {
private String jdbcUrl;
private PrintWriter logWriter;
@@ -41,7 +42,7 @@
return jdbcUrl;
}
- public void setJdbcUrl(String jdbcUrl) {
+ public void setJdbcUrl(final String jdbcUrl) {
this.jdbcUrl = jdbcUrl;
}
@@ -49,7 +50,7 @@
return new DriverManagerXAConnection(jdbcUrl);
}
- public XAConnection getXAConnection(String user, String password) throws SQLException {
+ public XAConnection getXAConnection(final String user, final String password) throws SQLException {
return new DriverManagerXAConnection(jdbcUrl, user, password);
}
@@ -57,7 +58,7 @@
return logWriter;
}
- public void setLogWriter(PrintWriter logWriter) {
+ public void setLogWriter(final PrintWriter logWriter) {
this.logWriter = logWriter;
}
@@ -66,7 +67,7 @@
return loginTimeout;
}
- public void setLoginTimeout(int loginTimeout) {
+ public void setLoginTimeout(final int loginTimeout) {
this.loginTimeout = loginTimeout;
}
@@ -78,11 +79,11 @@
protected Connection connection;
protected LocalXAResource xaResource;
- public DriverManagerXAConnection(String jdbcUrl) throws SQLException {
+ public DriverManagerXAConnection(final String jdbcUrl) throws SQLException {
this(jdbcUrl, null, null);
}
- public DriverManagerXAConnection(String jdbcUrl, String user, String password) throws SQLException {
+ public DriverManagerXAConnection(final String jdbcUrl, final String user, final String password) throws SQLException {
connection = null;
if (user == null) {
connection = DriverManager.getConnection(jdbcUrl);
@@ -104,16 +105,16 @@
connection.close();
}
- public void addConnectionEventListener(ConnectionEventListener listener) {
+ public void addConnectionEventListener(final ConnectionEventListener listener) {
}
- public void removeConnectionEventListener(ConnectionEventListener listener) {
+ public void removeConnectionEventListener(final ConnectionEventListener listener) {
}
- public void addStatementEventListener(StatementEventListener listener) {
+ public void addStatementEventListener(final StatementEventListener listener) {
}
- public void removeStatementEventListener(StatementEventListener listener) {
+ public void removeStatementEventListener(final StatementEventListener listener) {
}
}
@@ -125,7 +126,7 @@
private Xid xid;
private boolean originalAutoCommit;
- public LocalXAResource(Connection localTransaction) {
+ public LocalXAResource(final Connection localTransaction) {
this.connection = localTransaction;
}
@@ -133,7 +134,7 @@
return xid;
}
- public synchronized void start(Xid xid, int flag) throws XAException {
+ public synchronized void start(final Xid xid, final int flag) throws XAException {
if (flag == XAResource.TMNOFLAGS) {
// first time in this transaction
@@ -145,7 +146,7 @@
// save off the current auto commit flag so it can be restored after the transaction completes
try {
originalAutoCommit = connection.getAutoCommit();
- } catch (SQLException ignored) {
+ } catch (final SQLException ignored) {
// no big deal, just assume it was off
originalAutoCommit = true;
}
@@ -153,7 +154,7 @@
// update the auto commit flag
try {
connection.setAutoCommit(false);
- } catch (SQLException e) {
+ } catch (final SQLException e) {
throw (XAException) new XAException("Count not turn off auto commit for a XA transaction").initCause(e);
}
@@ -167,7 +168,7 @@
}
}
- public synchronized void end(Xid xid, int flag) throws XAException {
+ public synchronized void end(final Xid xid, final int flag) throws XAException {
if (xid == null) throw new NullPointerException("xid is null");
if (!this.xid.equals(xid)) throw new XAException("Invalid Xid: expected " + this.xid + ", but was " + xid);
@@ -176,7 +177,7 @@
// open transaction, so we must still wait for the commit or rollback method
}
- public synchronized int prepare(Xid xid) {
+ public synchronized int prepare(final Xid xid) {
// if the connection is read-only, then the resource is read-only
// NOTE: this assumes that the outer proxy throws an exception when application code
// attempts to set this in a transaction
@@ -188,7 +189,7 @@
// tell the transaction manager we are read only
return XAResource.XA_RDONLY;
}
- } catch (SQLException ignored) {
+ } catch (final SQLException ignored) {
// no big deal
}
@@ -196,7 +197,7 @@
return XAResource.XA_OK;
}
- public synchronized void commit(Xid xid, boolean flag) throws XAException {
+ public synchronized void commit(final Xid xid, final boolean flag) throws XAException {
if (xid == null) throw new NullPointerException("xid is null");
if (!this.xid.equals(xid)) throw new XAException("Invalid Xid: expected " + this.xid + ", but was " + xid);
@@ -210,45 +211,45 @@
if (!connection.isReadOnly()) {
connection.commit();
}
- } catch (SQLException e) {
+ } catch (final SQLException e) {
throw (XAException) new XAException().initCause(e);
} finally {
try {
connection.setAutoCommit(originalAutoCommit);
- } catch (SQLException e) {
+ } catch (final SQLException e) {
}
this.xid = null;
}
}
- public synchronized void rollback(Xid xid) throws XAException {
+ public synchronized void rollback(final Xid xid) throws XAException {
if (xid == null) throw new NullPointerException("xid is null");
if (!this.xid.equals(xid)) throw new XAException("Invalid Xid: expected " + this.xid + ", but was " + xid);
try {
connection.rollback();
- } catch (SQLException e) {
+ } catch (final SQLException e) {
throw (XAException) new XAException().initCause(e);
} finally {
try {
connection.setAutoCommit(originalAutoCommit);
- } catch (SQLException e) {
+ } catch (final SQLException e) {
}
this.xid = null;
}
}
- public boolean isSameRM(XAResource xaResource) {
+ public boolean isSameRM(final XAResource xaResource) {
return this == xaResource;
}
- public synchronized void forget(Xid xid) {
+ public synchronized void forget(final Xid xid) {
if (xid != null && this.xid.equals(xid)) {
this.xid = null;
}
}
- public Xid[] recover(int flag) {
+ public Xid[] recover(final int flag) {
return new Xid[0];
}
@@ -256,7 +257,7 @@
return 0;
}
- public boolean setTransactionTimeout(int transactionTimeout) {
+ public boolean setTransactionTimeout(final int transactionTimeout) {
return false;
}
}
diff --git a/src/main/java/org/apache/openejb/cts/HTTPSURLConnectionImpl.java b/src/main/java/org/apache/openejb/cts/HTTPSURLConnectionImpl.java
index fdc4d20..7b3fb20 100644
--- a/src/main/java/org/apache/openejb/cts/HTTPSURLConnectionImpl.java
+++ b/src/main/java/org/apache/openejb/cts/HTTPSURLConnectionImpl.java
@@ -32,24 +32,24 @@
public class HTTPSURLConnectionImpl implements TSHttpsURLConnectionInterface {
private HttpsURLConnection httpsURLConnection = null;
- public void init(URL url) throws IOException {
+ public void init(final URL url) throws IOException {
httpsURLConnection = (HttpsURLConnection) url.openConnection();
httpsURLConnection.setHostnameVerifier(new MyHostNameVerifier());
}
- public void setDoInput(boolean doInput) {
+ public void setDoInput(final boolean doInput) {
httpsURLConnection.setDoInput(doInput);
}
- public void setDoOutput(boolean doOutput) {
+ public void setDoOutput(final boolean doOutput) {
httpsURLConnection.setDoOutput(doOutput);
}
- public void setRequestProperty(String key, String value) {
+ public void setRequestProperty(final String key, final String value) {
httpsURLConnection.setRequestProperty(key, value);
}
- public void setUseCaches(boolean usecaches) {
+ public void setUseCaches(final boolean usecaches) {
httpsURLConnection.setUseCaches(usecaches);
}
@@ -61,11 +61,11 @@
return httpsURLConnection.getOutputStream();
}
- public String getHeaderField(String name) {
+ public String getHeaderField(final String name) {
return httpsURLConnection.getHeaderField(name);
}
- public String getHeaderField(int num) {
+ public String getHeaderField(final int num) {
return httpsURLConnection.getHeaderField(num);
}
@@ -74,11 +74,11 @@
}
public static class MyHostNameVerifier implements HostnameVerifier {
- public boolean verify(String urlhostname, String certHostName) {
+ public boolean verify(final String urlhostname, final String certHostName) {
return true;
}
- public boolean verify(String urlhostName, SSLSession sslSession) {
+ public boolean verify(final String urlhostName, final SSLSession sslSession) {
return true;
}
}
diff --git a/src/main/java/org/apache/openejb/cts/JMSAdminImpl.java b/src/main/java/org/apache/openejb/cts/JMSAdminImpl.java
index a020638..227bb1b 100644
--- a/src/main/java/org/apache/openejb/cts/JMSAdminImpl.java
+++ b/src/main/java/org/apache/openejb/cts/JMSAdminImpl.java
@@ -19,81 +19,83 @@
package org.apache.openejb.cts;
-import java.io.PrintWriter;
-
-import javax.jms.JMSException;
-
+import com.sun.ts.lib.porting.TSJMSAdminException;
+import com.sun.ts.lib.porting.TSJMSAdminInterface;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
-import com.sun.ts.lib.porting.TSJMSAdminException;
-import com.sun.ts.lib.porting.TSJMSAdminInterface;
+import javax.jms.JMSException;
+import java.io.PrintWriter;
public class JMSAdminImpl implements TSJMSAdminInterface {
private static final String HEAD = "OpenEJB - ";
private PrintWriter log;
- public void init(PrintWriter writer) {
+ public void init(final PrintWriter writer) {
this.log = writer;
log.println(HEAD + "initialized JMSAdmin helper");
}
- public void createQueueConnectionFactories(String[] queueConnectionFactories, String[] props)
+ public void createQueueConnectionFactories(final String[] queueConnectionFactories, final String[] props)
throws TSJMSAdminException {
}
- public void createQueues(String[] queues) throws TSJMSAdminException {
+ public void createQueues(final String[] queues) throws TSJMSAdminException {
}
- public void removeQueues(String[] queues) throws TSJMSAdminException {
- ActiveMQConnection connection=null;
+ public void removeQueues(final String[] queues) throws TSJMSAdminException {
+ ActiveMQConnection connection = null;
try {
- ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
+ final ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
connection = (ActiveMQConnection) factory.createConnection();
connection.start();
- for (int i = 0; i < queues.length; i++) {
- log.println(HEAD + "Destroying Queue: "+queues[i]);
- connection.destroyDestination(new ActiveMQQueue(queues[i]));
+ for (final String queue : queues) {
+ log.println(HEAD + "Destroying Queue: " + queue);
+ connection.destroyDestination(new ActiveMQQueue(queue));
}
- } catch (JMSException e) {
+ } catch (final JMSException e) {
e.printStackTrace();
} finally {
- try {
- connection.close();
- } catch (Throwable ignore) {
+ if (null != connection) {
+ try {
+ connection.close();
+ } catch (final Exception ignore) {
+ }
}
}
}
- public void createTopicConnectionFactories(String[] topicConnectionFactories, String[] props)
+ public void createTopicConnectionFactories(final String[] topicConnectionFactories, final String[] props)
throws TSJMSAdminException {
}
- public void createTopics(String[] topics) throws TSJMSAdminException {
+ public void createTopics(final String[] topics) throws TSJMSAdminException {
}
- public void removeTopics(String[] topics) throws TSJMSAdminException {
- ActiveMQConnection connection=null;
+ public void removeTopics(final String[] topics) throws TSJMSAdminException {
+ ActiveMQConnection connection = null;
try {
- ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
+ final ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("tcp://localhost:61616");
connection = (ActiveMQConnection) factory.createConnection();
connection.start();
- for (int i = 0; i < topics.length; i++) {
- log.println(HEAD + "Destroying Topic: "+topics[i]);
- connection.destroyDestination(new ActiveMQTopic(topics[i]));
+ for (final String topic : topics) {
+ log.println(HEAD + "Destroying Topic: " + topic);
+ connection.destroyDestination(new ActiveMQTopic(topic));
}
- } catch (JMSException e) {
+ } catch (final JMSException e) {
e.printStackTrace();
} finally {
- try {
- connection.close();
- } catch (Throwable ignore) {
+ if (null != connection) {
+ try {
+ connection.close();
+ } catch (final Exception ignore) {
+ }
}
}
}
- public void removeJmsConnectionFactories(String[] jmsConnectionFactoryNames) throws TSJMSAdminException {
+ public void removeJmsConnectionFactories(final String[] jmsConnectionFactoryNames) throws TSJMSAdminException {
}
}
diff --git a/src/main/java/org/apache/openejb/cts/LoginContextImpl.java b/src/main/java/org/apache/openejb/cts/LoginContextImpl.java
index 50dd365..36b6d90 100644
--- a/src/main/java/org/apache/openejb/cts/LoginContextImpl.java
+++ b/src/main/java/org/apache/openejb/cts/LoginContextImpl.java
@@ -27,7 +27,7 @@
//
// @param usr - string username
// @param pwd - string password
- public void login(String usr, String pwd) throws Exception {
+ public void login(final String usr, final String pwd) throws Exception {
System.err.println("login(String usr, String pwd) " + usr + ", " + pwd);
ClientSecurity.login(usr, pwd);
@@ -39,7 +39,7 @@
// the TS configuration file
//
// @param alias - alias is used to pick up the certificate from keystore
- public void login(String alias) throws Exception {
+ public void login(final String alias) throws Exception {
System.err.println("login(String alias) " + alias);
}
@@ -48,7 +48,7 @@
// @param alias - alias is used to pick up the certificate from keystore
// @param keystore - keystore file
// @param keyPass - keystore password
- public void login(String alias, String keystore, String keyPass) throws Exception {
+ public void login(final String alias, final String keystore, final String keyPass) throws Exception {
System.err.println("login(String alias, String keystore, String keyPass) " + alias + ", " + keystore + ", " + keyPass);
}
diff --git a/src/main/java/org/apache/openejb/cts/URLImpl.java b/src/main/java/org/apache/openejb/cts/URLImpl.java
index 5038c97..4c366b9 100644
--- a/src/main/java/org/apache/openejb/cts/URLImpl.java
+++ b/src/main/java/org/apache/openejb/cts/URLImpl.java
@@ -25,19 +25,19 @@
import java.net.URL;
public class URLImpl implements TSURLInterface {
- public URL getURL(String protocol, String host, int port, String file) throws MalformedURLException {
+ public URL getURL(final String protocol, final String host, final int port, final String file) throws MalformedURLException {
return new URL(protocol, host, port, file);
}
- public String getURLString(String protocol, String host, int port, String file) {
+ public String getURLString(final String protocol, final String host, final int port, final String file) {
try {
return new URL(protocol, host, port, file).toString();
- } catch (MalformedURLException e) {
+ } catch (final MalformedURLException e) {
throw new AssertionError();
}
}
- public String getRequest(String request) {
+ public String getRequest(final String request) {
return request;
}
}
diff --git a/src/test/java/org/apache/openejb/tck/util/GeneratePackages.java b/src/test/java/org/apache/openejb/tck/util/GeneratePackages.java
index 628fed1..1a2e6d9 100644
--- a/src/test/java/org/apache/openejb/tck/util/GeneratePackages.java
+++ b/src/test/java/org/apache/openejb/tck/util/GeneratePackages.java
@@ -27,40 +27,40 @@
*/
public class GeneratePackages {
- public static void main(String[] args) throws Exception {
+ public static void main(final String[] args) throws Exception {
new GeneratePackages().main();
}
public void main() throws Exception {
- File file = new File("/Users/dblevins/work/openejb-tck/trunk/webprofile.packages");
- Node root = new Node(null, "");
+ final File file = new File("/Users/dblevins/work/openejb-tck/trunk/webprofile.packages");
+ final Node root = new Node(null, "");
- BufferedReader reader = new BufferedReader(new FileReader(file));
+ final BufferedReader reader = new BufferedReader(new FileReader(file));
String line = null;
while ((line = reader.readLine()) != null) {
Node parent = root;
-
- String[] packages = line.split("\\.");
- for (String p : packages) {
+
+ final String[] packages = line.split("\\.");
+ for (final String p : packages) {
parent = parent.child(p);
}
}
- String pad = "";
- for (Node node : root.children.values()) {
+ final String pad = "";
+ for (final Node node : root.children.values()) {
print(node, pad);
}
}
- private void print(Node node, String pad) {
+ private void print(final Node node, String pad) {
if (node.children.size() == 0) {
System.out.println(pad + node.name);
} else {
pad += node.name + ".";
- for (Node n : node.children.values()) {
+ for (final Node n : node.children.values()) {
print(n, pad);
}
}
@@ -71,12 +71,12 @@
final Node parent;
final Map<String, Node> children = new LinkedHashMap<String, Node>();
- Node(Node parent, String name) {
+ Node(final Node parent, final String name) {
this.parent = parent;
this.name = name;
}
- public Node child(String name) {
+ public Node child(final String name) {
Node child = children.get(name);
@@ -89,11 +89,11 @@
}
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- Node node = (Node) o;
+ final Node node = (Node) o;
if (name != null ? !name.equals(node.name) : node.name != null) return false;
if (parent != null ? !parent.equals(node.parent) : node.parent != null) return false;
diff --git a/src/test/openejb/conf/openejb.xml b/src/test/openejb/conf/openejb.xml
index a3e1f91..91e6dc8 100644
--- a/src/test/openejb/conf/openejb.xml
+++ b/src/test/openejb/conf/openejb.xml
@@ -2,64 +2,64 @@
<openejb>
-<Container id="CmpContainer" ctype="CMP_ENTITY">
+ <Container id="CmpContainer" ctype="CMP_ENTITY">
CmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
- Engine hsql
- ConnectorName CtsDataSource
-</Container>
+ Engine hsql
+ ConnectorName CtsDataSource
+ </Container>
-<Container id="StatefulContainer" ctype="STATEFUL">
- Passivator org.apache.openejb.core.stateful.SimplePassivater
- TimeOut 20
- BulkPassivate 50
-</Container>
+ <Container id="StatefulContainer" ctype="STATEFUL">
+ Passivator org.apache.openejb.core.stateful.SimplePassivater
+ TimeOut 20
+ BulkPassivate 50
+ </Container>
-<Container id="StatelessContainer" ctype="STATELESS">
- TimeOut 0
- PoolSize 10
- StrictPooling true
-</Container>
+ <Container id="StatelessContainer" ctype="STATELESS">
+ TimeOut 0
+ PoolSize 10
+ StrictPooling true
+ </Container>
-<Container id="JmsMdbContainer" ctype="MESSAGE">
+ <Container id="JmsMdbContainer" ctype="MESSAGE">
ResourceAdapter JmsResourceAdapter
ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec
InstanceLimit 10
-</Container>
+ </Container>
-<Resource id="CtsDataSource" type="DataSource">
+ <Resource id="CtsDataSource" type="DataSource">
JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
JdbcUrl jdbc:derby:data/derbydb;create=true
- UserName cts
- Password cts
-</Resource>
+ UserName cts
+ Password cts
+ </Resource>
-<Resource id="CtsDataSourceUnmanaged" type="DataSource">
+ <Resource id="CtsDataSourceUnmanaged" type="DataSource">
JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
JdbcUrl jdbc:derby:data/derbydb;create=true
- UserName cts
- Password cts
-</Resource>
+ UserName cts
+ Password cts
+ </Resource>
-<Resource id="JmsResourceAdapter" type="ActiveMQResourceAdapter">
+ <Resource id="JmsResourceAdapter" type="ActiveMQResourceAdapter">
# Broker configuration
BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false
# Broker address
ServerUrl vm://localhost?async=true
- DataSource CtsDataSourceUnmanaged
-</Resource>
+ DataSource CtsDataSourceUnmanaged
+ </Resource>
-<Resource id="JmsConnectionFactory" type="javax.jms.ConnectionFactory">
+ <Resource id="JmsConnectionFactory" type="javax.jms.ConnectionFactory">
ResourceAdapter JmsResourceAdapter
-</Resource>
+ </Resource>
-<Resource id="MailSession" type="javax.mail.Session">
-mail.smtp.class=org.apache.geronimo.mail.NullTransport
-</Resource>
+ <Resource id="MailSession" type="javax.mail.Session">
+ mail.smtp.class=org.apache.geronimo.mail.NullTransport
+ </Resource>
-<Deployments dir="apps/" />
+ <Deployments dir="apps/"/>
</openejb>
diff --git a/src/test/tomcat/conf/openejb.xml b/src/test/tomcat/conf/openejb.xml
index b9a8381..c2d33bb 100644
--- a/src/test/tomcat/conf/openejb.xml
+++ b/src/test/tomcat/conf/openejb.xml
@@ -20,75 +20,74 @@
<openejb>
-<!--
-<Container id="Default CMP Container" ctype="CMP_ENTITY">
- CmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
- Engine derby
- ConnectorName Default JDBC Database
-</Container>
--->
+ <!--
+ <Container id="Default CMP Container" ctype="CMP_ENTITY">
+ CmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
+ Engine derby
+ ConnectorName Default JDBC Database
+ </Container>
+ -->
-<!--
-<Container id="Default BMP Container" ctype="BMP_ENTITY"/>
--->
+ <!--
+ <Container id="Default BMP Container" ctype="BMP_ENTITY"/>
+ -->
-<Container id="Default Stateful Container" ctype="STATEFUL">
- Passivator org.apache.openejb.core.stateful.SimplePassivater
- TimeOut 20
- BulkPassivate 50
-</Container>
+ <Container id="Default Stateful Container" ctype="STATEFUL">
+ Passivator org.apache.openejb.core.stateful.SimplePassivater
+ TimeOut 20
+ BulkPassivate 50
+ </Container>
+ <Container id="Default Stateless Container" ctype="STATELESS">
+ TimeOut 0
+ PoolSize 10
+ StrictPooling true
+ </Container>
-<Container id="Default Stateless Container" ctype="STATELESS">
- TimeOut 0
- PoolSize 10
- StrictPooling true
-</Container>
+ <!--
+ <Container id="Default MDB Container" ctype="MESSAGE">
+ ResourceAdapter Default JMS Resource Adapter
+ ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec
+ InstanceLimit 10
+ </Container>
+ -->
-<!--
-<Container id="Default MDB Container" ctype="MESSAGE">
- ResourceAdapter Default JMS Resource Adapter
- ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec
- InstanceLimit 10
-</Container>
--->
-
-<Connector id="Default JDBC Database">
+ <Connector id="Default JDBC Database">
JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
JdbcUrl jdbc:derby:data/derbydb;create=true
- UserName cts
- Password cts
-</Connector>
+ UserName cts
+ Password cts
+ </Connector>
-<Connector id="Default Unmanaged JDBC Database">
+ <Connector id="Default Unmanaged JDBC Database">
JdbcDriver org.apache.derby.jdbc.EmbeddedDriver
JdbcUrl jdbc:derby:data/derbydb;create=true
- UserName cts
- Password cts
-</Connector>
+ UserName cts
+ Password cts
+ </Connector>
-<!--
-<Resource id="Default JMS Resource Adapter">
- # Broker configuration
- BrokerXmlConfig broker:(tcp://localhost:61616)
+ <!--
+ <Resource id="Default JMS Resource Adapter">
+ # Broker configuration
+ BrokerXmlConfig broker:(tcp://localhost:61616)
- # Broker address
- ServerUrl vm://localhost?async=true
-</Resource>
--->
+ # Broker address
+ ServerUrl vm://localhost?async=true
+ </Resource>
+ -->
-<!--
-<Connector id="Default JMS Connection Factory">
- ResourceAdapter Default JMS Resource Adapter
-</Connector>
--->
+ <!--
+ <Connector id="Default JMS Connection Factory">
+ ResourceAdapter Default JMS Resource Adapter
+ </Connector>
+ -->
-<Resource id="Default Mail Session">
-mail.smtp.class=org.apache.geronimo.mail.NullTransport
-</Resource>
+ <Resource id="Default Mail Session">
+ mail.smtp.class=org.apache.geronimo.mail.NullTransport
+ </Resource>
-<Deployments dir="apps/" />
+ <Deployments dir="apps/"/>
</openejb>
diff --git a/src/test/tomcat/conf/server.xml b/src/test/tomcat/conf/server.xml
index 3ba3506..991f1a4 100644
--- a/src/test/tomcat/conf/server.xml
+++ b/src/test/tomcat/conf/server.xml
@@ -21,18 +21,18 @@
-->
<Server port="8005" shutdown="SHUTDOWN">
<!-- OpenEJB plugin for Tomcat -->
- <Listener className="org.apache.tomee.loader.OpenEJBListener" />
+ <Listener className="org.apache.tomee.loader.OpenEJBListener"/>
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
<!--APR library loader. Documentation at /docs/apr.html -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on"/>
<!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener" />
+ <Listener className="org.apache.catalina.core.JasperListener"/>
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
- <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
- <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener"/>
<!-- Global JNDI resources
Documentation at /docs/jndi-resources-howto.html
@@ -45,7 +45,7 @@
type="org.apache.catalina.UserDatabase"
description="User database that can be updated and saved"
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
+ pathname="conf/tomcat-users.xml"/>
</GlobalNamingResources>
<!-- A "Service" is a collection of one or more "Connectors" that share
@@ -71,7 +71,7 @@
-->
<Connector port="8080" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="8443" />
+ redirectPort="8443"/>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
@@ -89,7 +89,7 @@
keystoreFile="conf/clientcert.jks"/>
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
+ <Connector port="8009" protocol="AJP/1.3" redirectPort="8443"/>
<!-- An Engine represents the entry point (within Catalina) that processes
@@ -121,7 +121,7 @@
resourceName="UserDatabase"/>
</Realm>
- <Host name="localhost" appBase="webapps"
+ <Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true">
<!-- SingleSignOn valve, share authentication between web applications
diff --git a/src/test/tomcat/conf/tomcat-users.xml b/src/test/tomcat/conf/tomcat-users.xml
index d1b2519..1ac3ea0 100644
--- a/src/test/tomcat/conf/tomcat-users.xml
+++ b/src/test/tomcat/conf/tomcat-users.xml
@@ -18,10 +18,10 @@
-->
<tomcat-users>
- <user name="admin" password="admin" roles="manager" />
- <user name="jave_vi" password="javaee_vi" roles="staff" />
- <user name="javee_vi" password="javaee_vi" roles="staff" />
- <user name="javajoe" password="javajoe" roles="Manager,Employee,guest" />
- <user name="javaee" password="javaee" roles="Administrator,Employee,mgr,asadmin" />
- <user name="j2ee" password="j2ee" roles="Administrator,Employee,mgr,asadmin" />
+ <user name="admin" password="admin" roles="manager"/>
+ <user name="jave_vi" password="javaee_vi" roles="staff"/>
+ <user name="javee_vi" password="javaee_vi" roles="staff"/>
+ <user name="javajoe" password="javajoe" roles="Manager,Employee,guest"/>
+ <user name="javaee" password="javaee" roles="Administrator,Employee,mgr,asadmin"/>
+ <user name="j2ee" password="j2ee" roles="Administrator,Employee,mgr,asadmin"/>
</tomcat-users>
\ No newline at end of file
diff --git a/src/test/tomee-plume/conf/server.xml b/src/test/tomee-plume/conf/server.xml
index 032c4ce..28519af 100644
--- a/src/test/tomee-plume/conf/server.xml
+++ b/src/test/tomee-plume/conf/server.xml
@@ -21,18 +21,18 @@
-->
<Server port="%webcontainer.default.shutdown.port%" shutdown="SHUTDOWN">
<!-- OpenEJB plugin for Tomcat -->
- <Listener className="org.apache.tomee.catalina.ServerListener" />
+ <Listener className="org.apache.tomee.catalina.ServerListener"/>
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
<!--APR library loader. Documentation at /docs/apr.html -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on"/>
<!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener" />
+ <Listener className="org.apache.catalina.core.JasperListener"/>
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
- <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
- <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener"/>
<!-- Global JNDI resources
Documentation at /docs/jndi-resources-howto.html
@@ -45,7 +45,7 @@
type="org.apache.catalina.UserDatabase"
description="User database that can be updated and saved"
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
+ pathname="conf/tomcat-users.xml"/>
</GlobalNamingResources>
<!-- A "Service" is a collection of one or more "Connectors" that share
@@ -71,7 +71,7 @@
-->
<Connector port="%webcontainer.default.port%" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="%webcontainer.default.ssl.port%" />
+ redirectPort="%webcontainer.default.ssl.port%"/>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
@@ -87,7 +87,7 @@
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS"
keystoreFile="conf/clientcert.jks" keystorePass="changeit" keyAlias="cts"
- truststoreFile="conf/ssl-truststore" truststorePass="changeit" />
+ truststoreFile="conf/ssl-truststore" truststorePass="changeit"/>
<!-- Define an AJP 1.3 Connector on port 8009 -->
<!-- <Connector port="%tomee.ajp.port%" protocol="AJP/1.3" redirectPort="%tomee.ssl.port%" /> -->
@@ -122,7 +122,7 @@
resourceName="UserDatabase"/>
</Realm>
- <Host name="localhost" appBase="webapps"
+ <Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true">
<!-- SingleSignOn valve, share authentication between web applications
diff --git a/src/test/tomee-plume/conf/tomcat-users.xml b/src/test/tomee-plume/conf/tomcat-users.xml
index e4eb0ca..3bc8788 100644
--- a/src/test/tomee-plume/conf/tomcat-users.xml
+++ b/src/test/tomee-plume/conf/tomcat-users.xml
@@ -18,12 +18,12 @@
-->
<tomcat-users>
- <user name="admin" password="admin" roles="manager" />
- <user name="jave_vi" password="javaee_vi" roles="staff" />
- <user name="javee_vi" password="javaee_vi" roles="staff" />
- <user name="javajoe" password="javajoe" roles="Manager,Employee,guest" />
- <user name="javaee" password="javaee" roles="Administrator,Employee,mgr,asadmin" />
- <user name="j2ee" password="j2ee" roles="Administrator,Employee,mgr,asadmin" />
+ <user name="admin" password="admin" roles="manager"/>
+ <user name="jave_vi" password="javaee_vi" roles="staff"/>
+ <user name="javee_vi" password="javaee_vi" roles="staff"/>
+ <user name="javajoe" password="javajoe" roles="Manager,Employee,guest"/>
+ <user name="javaee" password="javaee" roles="Administrator,Employee,mgr,asadmin"/>
+ <user name="j2ee" password="j2ee" roles="Administrator,Employee,mgr,asadmin"/>
- <user name="CN=CTS, OU=Java Software, O=Sun Microsystems Inc., L=Burlington, ST=MA, C=US" roles="Administrator" />
+ <user name="CN=CTS, OU=Java Software, O=Sun Microsystems Inc., L=Burlington, ST=MA, C=US" roles="Administrator"/>
</tomcat-users>
diff --git a/src/test/tomee-plume/conf/tomee.xml b/src/test/tomee-plume/conf/tomee.xml
index 835ae18..31eeeee 100644
--- a/src/test/tomee-plume/conf/tomee.xml
+++ b/src/test/tomee-plume/conf/tomee.xml
@@ -20,73 +20,72 @@
<openejb>
-<Container id="CmpContainer" ctype="CMP_ENTITY">
+ <Container id="CmpContainer" ctype="CMP_ENTITY">
CmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
- Engine derby
- ConnectorName CtsDataSource
-</Container>
+ Engine derby
+ ConnectorName CtsDataSource
+ </Container>
-<Container id="StatefulContainer" ctype="STATEFUL">
- Passivator org.apache.openejb.core.stateful.SimplePassivater
- TimeOut 20
- BulkPassivate 50
-</Container>
+ <Container id="StatefulContainer" ctype="STATEFUL">
+ Passivator org.apache.openejb.core.stateful.SimplePassivater
+ TimeOut 20
+ BulkPassivate 50
+ </Container>
+ <Container id="StatelessContainer" ctype="STATELESS">
+ TimeOut 0
+ PoolSize 10
+ StrictPooling true
+ </Container>
-<Container id="StatelessContainer" ctype="STATELESS">
- TimeOut 0
- PoolSize 10
- StrictPooling true
-</Container>
+ <Container id="SingletonContainer" ctype="SINGLETON">
+ AccessTimeout 2 minutes
+ </Container>
-<Container id="SingletonContainer" ctype="SINGLETON">
- AccessTimeout 2 minutes
-</Container>
+ <!--<Container id="JmsMdbContainer" ctype="MESSAGE">-->
+ <!--ResourceAdapter JmsResourceAdapter-->
+ <!--ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec-->
+ <!--InstanceLimit 10-->
+ <!--</Container>-->
-<!--<Container id="JmsMdbContainer" ctype="MESSAGE">-->
- <!--ResourceAdapter JmsResourceAdapter-->
- <!--ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec-->
- <!--InstanceLimit 10-->
-<!--</Container>-->
-
-<!-- That should be also specified in the system.properties file of the target environment -->
-<Resource id="jdbc/DB1" type="DataSource">
+ <!-- That should be also specified in the system.properties file of the target environment -->
+ <Resource id="jdbc/DB1" type="DataSource">
JdbcDriver org.apache.derby.jdbc.ClientDriver
JdbcUrl jdbc:derby://localhost:%derby.server.port%/derbydb;create=true
- UserName cts
- Password cts
-</Resource>
+ UserName cts
+ Password cts
+ </Resource>
-<Resource id="jdbc/DB1Unmanaged" type="DataSource">
+ <Resource id="jdbc/DB1Unmanaged" type="DataSource">
JdbcDriver org.apache.derby.jdbc.ClientDriver
JdbcUrl jdbc:derby://localhost:%derby.server.port%/derbydb;create=true
- UserName cts
- Password cts
- JtaManaged false
-</Resource>
+ UserName cts
+ Password cts
+ JtaManaged false
+ </Resource>
-<!--<Resource id="JmsResourceAdapter" type="ActiveMQResourceAdapter">-->
- <!--# Broker configuration-->
- <!--BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false-->
+ <!--<Resource id="JmsResourceAdapter" type="ActiveMQResourceAdapter">-->
+ <!--# Broker configuration-->
+ <!--BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false-->
- <!--# Broker address-->
- <!--ServerUrl vm://localhost?async=true-->
+ <!--# Broker address-->
+ <!--ServerUrl vm://localhost?async=true-->
- <!--DataSource CtsDataSourceUnmanaged-->
-<!--</Resource>-->
+ <!--DataSource CtsDataSourceUnmanaged-->
+ <!--</Resource>-->
-<!--<Resource id="JmsConnectionFactory" type="javax.jms.ConnectionFactory">-->
- <!--ResourceAdapter JmsResourceAdapter-->
-<!--</Resource>-->
+ <!--<Resource id="JmsConnectionFactory" type="javax.jms.ConnectionFactory">-->
+ <!--ResourceAdapter JmsResourceAdapter-->
+ <!--</Resource>-->
-<Resource id="MailSession" type="javax.mail.Session">
-mail.smtp.class=org.apache.geronimo.mail.NullTransport
-</Resource>
+ <Resource id="MailSession" type="javax.mail.Session">
+ mail.smtp.class=org.apache.geronimo.mail.NullTransport
+ </Resource>
-<Deployments dir="apps/" />
+ <Deployments dir="apps/"/>
</openejb>
diff --git a/src/test/tomee-plus/conf/server.xml b/src/test/tomee-plus/conf/server.xml
index 032c4ce..28519af 100644
--- a/src/test/tomee-plus/conf/server.xml
+++ b/src/test/tomee-plus/conf/server.xml
@@ -21,18 +21,18 @@
-->
<Server port="%webcontainer.default.shutdown.port%" shutdown="SHUTDOWN">
<!-- OpenEJB plugin for Tomcat -->
- <Listener className="org.apache.tomee.catalina.ServerListener" />
+ <Listener className="org.apache.tomee.catalina.ServerListener"/>
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
<!--APR library loader. Documentation at /docs/apr.html -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on"/>
<!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener" />
+ <Listener className="org.apache.catalina.core.JasperListener"/>
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
- <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
- <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener"/>
<!-- Global JNDI resources
Documentation at /docs/jndi-resources-howto.html
@@ -45,7 +45,7 @@
type="org.apache.catalina.UserDatabase"
description="User database that can be updated and saved"
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
+ pathname="conf/tomcat-users.xml"/>
</GlobalNamingResources>
<!-- A "Service" is a collection of one or more "Connectors" that share
@@ -71,7 +71,7 @@
-->
<Connector port="%webcontainer.default.port%" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="%webcontainer.default.ssl.port%" />
+ redirectPort="%webcontainer.default.ssl.port%"/>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
@@ -87,7 +87,7 @@
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS"
keystoreFile="conf/clientcert.jks" keystorePass="changeit" keyAlias="cts"
- truststoreFile="conf/ssl-truststore" truststorePass="changeit" />
+ truststoreFile="conf/ssl-truststore" truststorePass="changeit"/>
<!-- Define an AJP 1.3 Connector on port 8009 -->
<!-- <Connector port="%tomee.ajp.port%" protocol="AJP/1.3" redirectPort="%tomee.ssl.port%" /> -->
@@ -122,7 +122,7 @@
resourceName="UserDatabase"/>
</Realm>
- <Host name="localhost" appBase="webapps"
+ <Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true">
<!-- SingleSignOn valve, share authentication between web applications
diff --git a/src/test/tomee-plus/conf/tomcat-users.xml b/src/test/tomee-plus/conf/tomcat-users.xml
index e4eb0ca..3bc8788 100644
--- a/src/test/tomee-plus/conf/tomcat-users.xml
+++ b/src/test/tomee-plus/conf/tomcat-users.xml
@@ -18,12 +18,12 @@
-->
<tomcat-users>
- <user name="admin" password="admin" roles="manager" />
- <user name="jave_vi" password="javaee_vi" roles="staff" />
- <user name="javee_vi" password="javaee_vi" roles="staff" />
- <user name="javajoe" password="javajoe" roles="Manager,Employee,guest" />
- <user name="javaee" password="javaee" roles="Administrator,Employee,mgr,asadmin" />
- <user name="j2ee" password="j2ee" roles="Administrator,Employee,mgr,asadmin" />
+ <user name="admin" password="admin" roles="manager"/>
+ <user name="jave_vi" password="javaee_vi" roles="staff"/>
+ <user name="javee_vi" password="javaee_vi" roles="staff"/>
+ <user name="javajoe" password="javajoe" roles="Manager,Employee,guest"/>
+ <user name="javaee" password="javaee" roles="Administrator,Employee,mgr,asadmin"/>
+ <user name="j2ee" password="j2ee" roles="Administrator,Employee,mgr,asadmin"/>
- <user name="CN=CTS, OU=Java Software, O=Sun Microsystems Inc., L=Burlington, ST=MA, C=US" roles="Administrator" />
+ <user name="CN=CTS, OU=Java Software, O=Sun Microsystems Inc., L=Burlington, ST=MA, C=US" roles="Administrator"/>
</tomcat-users>
diff --git a/src/test/tomee-plus/conf/tomee.xml b/src/test/tomee-plus/conf/tomee.xml
index 835ae18..31eeeee 100644
--- a/src/test/tomee-plus/conf/tomee.xml
+++ b/src/test/tomee-plus/conf/tomee.xml
@@ -20,73 +20,72 @@
<openejb>
-<Container id="CmpContainer" ctype="CMP_ENTITY">
+ <Container id="CmpContainer" ctype="CMP_ENTITY">
CmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
- Engine derby
- ConnectorName CtsDataSource
-</Container>
+ Engine derby
+ ConnectorName CtsDataSource
+ </Container>
-<Container id="StatefulContainer" ctype="STATEFUL">
- Passivator org.apache.openejb.core.stateful.SimplePassivater
- TimeOut 20
- BulkPassivate 50
-</Container>
+ <Container id="StatefulContainer" ctype="STATEFUL">
+ Passivator org.apache.openejb.core.stateful.SimplePassivater
+ TimeOut 20
+ BulkPassivate 50
+ </Container>
+ <Container id="StatelessContainer" ctype="STATELESS">
+ TimeOut 0
+ PoolSize 10
+ StrictPooling true
+ </Container>
-<Container id="StatelessContainer" ctype="STATELESS">
- TimeOut 0
- PoolSize 10
- StrictPooling true
-</Container>
+ <Container id="SingletonContainer" ctype="SINGLETON">
+ AccessTimeout 2 minutes
+ </Container>
-<Container id="SingletonContainer" ctype="SINGLETON">
- AccessTimeout 2 minutes
-</Container>
+ <!--<Container id="JmsMdbContainer" ctype="MESSAGE">-->
+ <!--ResourceAdapter JmsResourceAdapter-->
+ <!--ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec-->
+ <!--InstanceLimit 10-->
+ <!--</Container>-->
-<!--<Container id="JmsMdbContainer" ctype="MESSAGE">-->
- <!--ResourceAdapter JmsResourceAdapter-->
- <!--ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec-->
- <!--InstanceLimit 10-->
-<!--</Container>-->
-
-<!-- That should be also specified in the system.properties file of the target environment -->
-<Resource id="jdbc/DB1" type="DataSource">
+ <!-- That should be also specified in the system.properties file of the target environment -->
+ <Resource id="jdbc/DB1" type="DataSource">
JdbcDriver org.apache.derby.jdbc.ClientDriver
JdbcUrl jdbc:derby://localhost:%derby.server.port%/derbydb;create=true
- UserName cts
- Password cts
-</Resource>
+ UserName cts
+ Password cts
+ </Resource>
-<Resource id="jdbc/DB1Unmanaged" type="DataSource">
+ <Resource id="jdbc/DB1Unmanaged" type="DataSource">
JdbcDriver org.apache.derby.jdbc.ClientDriver
JdbcUrl jdbc:derby://localhost:%derby.server.port%/derbydb;create=true
- UserName cts
- Password cts
- JtaManaged false
-</Resource>
+ UserName cts
+ Password cts
+ JtaManaged false
+ </Resource>
-<!--<Resource id="JmsResourceAdapter" type="ActiveMQResourceAdapter">-->
- <!--# Broker configuration-->
- <!--BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false-->
+ <!--<Resource id="JmsResourceAdapter" type="ActiveMQResourceAdapter">-->
+ <!--# Broker configuration-->
+ <!--BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false-->
- <!--# Broker address-->
- <!--ServerUrl vm://localhost?async=true-->
+ <!--# Broker address-->
+ <!--ServerUrl vm://localhost?async=true-->
- <!--DataSource CtsDataSourceUnmanaged-->
-<!--</Resource>-->
+ <!--DataSource CtsDataSourceUnmanaged-->
+ <!--</Resource>-->
-<!--<Resource id="JmsConnectionFactory" type="javax.jms.ConnectionFactory">-->
- <!--ResourceAdapter JmsResourceAdapter-->
-<!--</Resource>-->
+ <!--<Resource id="JmsConnectionFactory" type="javax.jms.ConnectionFactory">-->
+ <!--ResourceAdapter JmsResourceAdapter-->
+ <!--</Resource>-->
-<Resource id="MailSession" type="javax.mail.Session">
-mail.smtp.class=org.apache.geronimo.mail.NullTransport
-</Resource>
+ <Resource id="MailSession" type="javax.mail.Session">
+ mail.smtp.class=org.apache.geronimo.mail.NullTransport
+ </Resource>
-<Deployments dir="apps/" />
+ <Deployments dir="apps/"/>
</openejb>
diff --git a/src/test/tomee/conf/server.xml b/src/test/tomee/conf/server.xml
index 032c4ce..28519af 100644
--- a/src/test/tomee/conf/server.xml
+++ b/src/test/tomee/conf/server.xml
@@ -21,18 +21,18 @@
-->
<Server port="%webcontainer.default.shutdown.port%" shutdown="SHUTDOWN">
<!-- OpenEJB plugin for Tomcat -->
- <Listener className="org.apache.tomee.catalina.ServerListener" />
+ <Listener className="org.apache.tomee.catalina.ServerListener"/>
<!-- Security listener. Documentation at /docs/config/listeners.html
<Listener className="org.apache.catalina.security.SecurityListener" />
-->
<!--APR library loader. Documentation at /docs/apr.html -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on"/>
<!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
- <Listener className="org.apache.catalina.core.JasperListener" />
+ <Listener className="org.apache.catalina.core.JasperListener"/>
<!-- Prevent memory leaks due to use of particular java/javax APIs-->
- <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
- <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
- <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+ <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/>
+ <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
+ <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener"/>
<!-- Global JNDI resources
Documentation at /docs/jndi-resources-howto.html
@@ -45,7 +45,7 @@
type="org.apache.catalina.UserDatabase"
description="User database that can be updated and saved"
factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
- pathname="conf/tomcat-users.xml" />
+ pathname="conf/tomcat-users.xml"/>
</GlobalNamingResources>
<!-- A "Service" is a collection of one or more "Connectors" that share
@@ -71,7 +71,7 @@
-->
<Connector port="%webcontainer.default.port%" protocol="HTTP/1.1"
connectionTimeout="20000"
- redirectPort="%webcontainer.default.ssl.port%" />
+ redirectPort="%webcontainer.default.ssl.port%"/>
<!-- A "Connector" using the shared thread pool-->
<!--
<Connector executor="tomcatThreadPool"
@@ -87,7 +87,7 @@
maxThreads="150" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS"
keystoreFile="conf/clientcert.jks" keystorePass="changeit" keyAlias="cts"
- truststoreFile="conf/ssl-truststore" truststorePass="changeit" />
+ truststoreFile="conf/ssl-truststore" truststorePass="changeit"/>
<!-- Define an AJP 1.3 Connector on port 8009 -->
<!-- <Connector port="%tomee.ajp.port%" protocol="AJP/1.3" redirectPort="%tomee.ssl.port%" /> -->
@@ -122,7 +122,7 @@
resourceName="UserDatabase"/>
</Realm>
- <Host name="localhost" appBase="webapps"
+ <Host name="localhost" appBase="webapps"
unpackWARs="true" autoDeploy="true">
<!-- SingleSignOn valve, share authentication between web applications
diff --git a/src/test/tomee/conf/tomcat-users.xml b/src/test/tomee/conf/tomcat-users.xml
index e4eb0ca..3bc8788 100644
--- a/src/test/tomee/conf/tomcat-users.xml
+++ b/src/test/tomee/conf/tomcat-users.xml
@@ -18,12 +18,12 @@
-->
<tomcat-users>
- <user name="admin" password="admin" roles="manager" />
- <user name="jave_vi" password="javaee_vi" roles="staff" />
- <user name="javee_vi" password="javaee_vi" roles="staff" />
- <user name="javajoe" password="javajoe" roles="Manager,Employee,guest" />
- <user name="javaee" password="javaee" roles="Administrator,Employee,mgr,asadmin" />
- <user name="j2ee" password="j2ee" roles="Administrator,Employee,mgr,asadmin" />
+ <user name="admin" password="admin" roles="manager"/>
+ <user name="jave_vi" password="javaee_vi" roles="staff"/>
+ <user name="javee_vi" password="javaee_vi" roles="staff"/>
+ <user name="javajoe" password="javajoe" roles="Manager,Employee,guest"/>
+ <user name="javaee" password="javaee" roles="Administrator,Employee,mgr,asadmin"/>
+ <user name="j2ee" password="j2ee" roles="Administrator,Employee,mgr,asadmin"/>
- <user name="CN=CTS, OU=Java Software, O=Sun Microsystems Inc., L=Burlington, ST=MA, C=US" roles="Administrator" />
+ <user name="CN=CTS, OU=Java Software, O=Sun Microsystems Inc., L=Burlington, ST=MA, C=US" roles="Administrator"/>
</tomcat-users>
diff --git a/src/test/tomee/conf/tomee.xml b/src/test/tomee/conf/tomee.xml
index 835ae18..31eeeee 100644
--- a/src/test/tomee/conf/tomee.xml
+++ b/src/test/tomee/conf/tomee.xml
@@ -20,73 +20,72 @@
<openejb>
-<Container id="CmpContainer" ctype="CMP_ENTITY">
+ <Container id="CmpContainer" ctype="CMP_ENTITY">
CmpEngineFactory org.apache.openejb.core.cmp.jpa.JpaCmpEngineFactory
- Engine derby
- ConnectorName CtsDataSource
-</Container>
+ Engine derby
+ ConnectorName CtsDataSource
+ </Container>
-<Container id="StatefulContainer" ctype="STATEFUL">
- Passivator org.apache.openejb.core.stateful.SimplePassivater
- TimeOut 20
- BulkPassivate 50
-</Container>
+ <Container id="StatefulContainer" ctype="STATEFUL">
+ Passivator org.apache.openejb.core.stateful.SimplePassivater
+ TimeOut 20
+ BulkPassivate 50
+ </Container>
+ <Container id="StatelessContainer" ctype="STATELESS">
+ TimeOut 0
+ PoolSize 10
+ StrictPooling true
+ </Container>
-<Container id="StatelessContainer" ctype="STATELESS">
- TimeOut 0
- PoolSize 10
- StrictPooling true
-</Container>
+ <Container id="SingletonContainer" ctype="SINGLETON">
+ AccessTimeout 2 minutes
+ </Container>
-<Container id="SingletonContainer" ctype="SINGLETON">
- AccessTimeout 2 minutes
-</Container>
+ <!--<Container id="JmsMdbContainer" ctype="MESSAGE">-->
+ <!--ResourceAdapter JmsResourceAdapter-->
+ <!--ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec-->
+ <!--InstanceLimit 10-->
+ <!--</Container>-->
-<!--<Container id="JmsMdbContainer" ctype="MESSAGE">-->
- <!--ResourceAdapter JmsResourceAdapter-->
- <!--ActivationSpecClass org.apache.activemq.ra.ActiveMQActivationSpec-->
- <!--InstanceLimit 10-->
-<!--</Container>-->
-
-<!-- That should be also specified in the system.properties file of the target environment -->
-<Resource id="jdbc/DB1" type="DataSource">
+ <!-- That should be also specified in the system.properties file of the target environment -->
+ <Resource id="jdbc/DB1" type="DataSource">
JdbcDriver org.apache.derby.jdbc.ClientDriver
JdbcUrl jdbc:derby://localhost:%derby.server.port%/derbydb;create=true
- UserName cts
- Password cts
-</Resource>
+ UserName cts
+ Password cts
+ </Resource>
-<Resource id="jdbc/DB1Unmanaged" type="DataSource">
+ <Resource id="jdbc/DB1Unmanaged" type="DataSource">
JdbcDriver org.apache.derby.jdbc.ClientDriver
JdbcUrl jdbc:derby://localhost:%derby.server.port%/derbydb;create=true
- UserName cts
- Password cts
- JtaManaged false
-</Resource>
+ UserName cts
+ Password cts
+ JtaManaged false
+ </Resource>
-<!--<Resource id="JmsResourceAdapter" type="ActiveMQResourceAdapter">-->
- <!--# Broker configuration-->
- <!--BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false-->
+ <!--<Resource id="JmsResourceAdapter" type="ActiveMQResourceAdapter">-->
+ <!--# Broker configuration-->
+ <!--BrokerXmlConfig broker:(tcp://localhost:61616)?useJmx=false-->
- <!--# Broker address-->
- <!--ServerUrl vm://localhost?async=true-->
+ <!--# Broker address-->
+ <!--ServerUrl vm://localhost?async=true-->
- <!--DataSource CtsDataSourceUnmanaged-->
-<!--</Resource>-->
+ <!--DataSource CtsDataSourceUnmanaged-->
+ <!--</Resource>-->
-<!--<Resource id="JmsConnectionFactory" type="javax.jms.ConnectionFactory">-->
- <!--ResourceAdapter JmsResourceAdapter-->
-<!--</Resource>-->
+ <!--<Resource id="JmsConnectionFactory" type="javax.jms.ConnectionFactory">-->
+ <!--ResourceAdapter JmsResourceAdapter-->
+ <!--</Resource>-->
-<Resource id="MailSession" type="javax.mail.Session">
-mail.smtp.class=org.apache.geronimo.mail.NullTransport
-</Resource>
+ <Resource id="MailSession" type="javax.mail.Session">
+ mail.smtp.class=org.apache.geronimo.mail.NullTransport
+ </Resource>
-<Deployments dir="apps/" />
+ <Deployments dir="apps/"/>
</openejb>
diff --git a/webprofile.properties b/webprofile.properties
index 1088ebf..c61e305 100644
--- a/webprofile.properties
+++ b/webprofile.properties
@@ -1,8 +1,7 @@
project.name= webprofile-2.0.x
project.version= 2.0.0-SNAPSHOT
project.id= 1
-#project.scmUrl= scm:git:https://git-wip-us.apache.org/repos/asf/tomee.git
-project.scmUrl= scm:git:https://git-wip-us.apache.org/repos/asf/tomee.git/tree/heads/develop
+project.scmUrl = scm:svn:https://svn.apache.org/repos/tck/tomee-tck/trunk
project.buildFile= runtests
include.f.javatest.log= target/logs/javatest.log
include.d.logs=.*target/(apache|openejb).*/logs/.*
