You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/08/06 03:47:20 UTC
svn commit: r429088 [6/7] - in /geronimo/branches/dain/notcm: ./
applications/ applications/console/ applications/console/console-core/
applications/console/console-ear/ applications/console/console-framework/
applications/console/console-framework/src...
Modified: geronimo/branches/dain/notcm/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java (original)
+++ geronimo/branches/dain/notcm/modules/security/src/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java Sat Aug 5 18:47:06 2006
@@ -18,6 +18,8 @@
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -31,14 +33,17 @@
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.SignatureException;
import java.security.UnrecoverableKeyException;
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
@@ -62,6 +67,11 @@
import org.apache.geronimo.management.geronimo.KeystoreInstance;
import org.apache.geronimo.management.geronimo.KeystoreIsLocked;
import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.geronimo.util.asn1.ASN1Set;
+import org.apache.geronimo.util.asn1.DEROutputStream;
+import org.apache.geronimo.util.asn1.x509.X509Name;
+import org.apache.geronimo.util.encoders.Base64;
+import org.apache.geronimo.util.jce.PKCS10CertificationRequest;
import org.apache.geronimo.util.jce.X509Principal;
import org.apache.geronimo.util.jce.X509V1CertificateGenerator;
@@ -285,6 +295,135 @@
return false;
}
+
+ public String generateCSR(String alias) {
+ // find certificate by alias
+ X509Certificate cert = null;
+ try {
+ cert = (X509Certificate) keystore.getCertificate(alias);
+ } catch (KeyStoreException e) {
+ log.error("Unable to generate CSR", e);
+ }
+
+ // find private key by alias
+ PrivateKey key = null;
+ try {
+ key = (PrivateKey) keystore.getKey(alias, (char[])keyPasswords.get(alias));
+ } catch (KeyStoreException e) {
+ log.error("Unable to generate CSR", e);
+ } catch (NoSuchAlgorithmException e) {
+ log.error("Unable to generate CSR", e);
+ } catch (UnrecoverableKeyException e) {
+ log.error("Unable to generate CSR", e);
+ }
+
+ // generate csr
+ String csr = null;
+ try {
+ csr = generateCSR(cert, key);
+ } catch (Exception e) {
+ log.error("Unable to generate CSR", e);
+ }
+ return csr;
+ }
+
+ private String generateCSR(X509Certificate cert, PrivateKey signingKey) throws InvalidKeyException, NoSuchAlgorithmException, NoSuchProviderException, SignatureException, KeyStoreException, IOException {
+ String sigalg = cert.getSigAlgName();
+ X509Name subject = new X509Name(cert.getSubjectDN().toString());
+ PublicKey publicKey = cert.getPublicKey();
+ ASN1Set attributes = null;
+
+ PKCS10CertificationRequest csr = new PKCS10CertificationRequest(sigalg,
+ subject, publicKey, attributes, signingKey);
+
+ if (!csr.verify()) {
+ throw new KeyStoreException("CSR verification failed");
+ }
+
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+ DEROutputStream deros = new DEROutputStream(os);
+ deros.writeObject(csr.getDERObject());
+ String b64 = new String(Base64.encode(os.toByteArray()));
+
+ final String BEGIN_CERT_REQ = "-----BEGIN CERTIFICATE REQUEST-----";
+ final String END_CERT_REQ = "-----END CERTIFICATE REQUEST-----";
+ final int CERT_REQ_LINE_LENGTH = 70;
+
+ StringBuffer sbuf = new StringBuffer(BEGIN_CERT_REQ).append('\n');
+
+ int idx = 0;
+ while (idx < b64.length()) {
+
+ int len = (idx + CERT_REQ_LINE_LENGTH > b64.length()) ? b64
+ .length()
+ - idx : CERT_REQ_LINE_LENGTH;
+
+ String chunk = b64.substring(idx, idx + len);
+
+ sbuf.append(chunk).append('\n');
+ idx += len;
+ }
+
+ sbuf.append(END_CERT_REQ);
+ return sbuf.toString();
+ }
+
+ public void importPKCS7Certificate(String alias, String certbuf)
+ throws java.security.cert.CertificateException,
+ java.security.NoSuchProviderException,
+ java.security.KeyStoreException,
+ java.security.NoSuchAlgorithmException,
+ java.security.UnrecoverableKeyException, java.io.IOException {
+ InputStream is = null;
+
+ try {
+ is = new ByteArrayInputStream(certbuf.getBytes());
+ importPKCS7Certificate(alias, is);
+ } finally {
+ if (is != null) {
+ try {
+ is.close();
+ } catch (Exception e) {
+ }
+ }
+ }
+ }
+
+ private void importPKCS7Certificate(String alias, InputStream is)
+ throws java.security.cert.CertificateException,
+ java.security.NoSuchProviderException,
+ java.security.KeyStoreException,
+ java.security.NoSuchAlgorithmException,
+ java.security.UnrecoverableKeyException, java.io.IOException {
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ Collection certcoll = cf.generateCertificates(is);
+
+ Certificate[] chain = new Certificate[certcoll.size()];
+
+ Iterator iter = certcoll.iterator();
+ for (int i = 0; iter.hasNext(); i++) {
+ chain[i] = (Certificate) iter.next();
+ }
+
+ char[] keyPassword = (char[])keyPasswords.get(alias);
+ keystore.setKeyEntry(alias, keystore.getKey(alias, keyPassword), keyPassword,
+ chain);
+
+ saveKeystore(keystorePassword);
+ }
+
+ public void deleteEntry(String alias) {
+ try {
+ keystore.deleteEntry(alias);
+ privateKeys.remove(alias);
+ trustCerts.remove(alias);
+ keyPasswords.remove(alias);
+ } catch (KeyStoreException e) {
+ log.error("Unable to delete entry:"+alias, e);
+ }
+ saveKeystore(keystorePassword);
+ }
+
public KeyManager[] getKeyManager(String algorithm, String alias) throws NoSuchAlgorithmException, UnrecoverableKeyException, KeyStoreException, KeystoreIsLocked {
if(isKeystoreLocked()) {
throw new KeystoreIsLocked("Keystore '"+keystoreName+"' is locked; please unlock it in the console.");
Modified: geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java (original)
+++ geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/ConfigurationEntryTest.java Sat Aug 5 18:47:06 2006
@@ -56,7 +56,8 @@
* @version $Rev$ $Date$
*/
public class ConfigurationEntryTest extends TestCase {
-
+ private File basedir = new File(System.getProperty("basedir"));
+
protected Kernel kernel;
protected AbstractName serverInfo;
protected AbstractName loginConfiguration;
@@ -69,10 +70,11 @@
protected AbstractName serverStub;
public void test() throws Exception {
- File log = new File("target/login-audit.log");
+ File log = new File(basedir, "target/login-audit.log");
if (log.exists()) {
log.delete();
}
+
assertEquals("Audit file wasn't cleared", 0, log.length());
// First try with explicit configuration entry
@@ -172,8 +174,8 @@
gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
gbean.setAttribute("serverSide", new Boolean(true));
Properties props = new Properties();
- props.put("usersURI", new File(new File("."), "src/test-data/data/users.properties").toURI().toString());
- props.put("groupsURI", new File(new File("."), "src/test-data/data/groups.properties").toURI().toString());
+ props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
+ props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
gbean.setAttribute("options", props);
gbean.setAttribute("loginDomainName", "TestProperties");
gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
Modified: geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java (original)
+++ geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java Sat Aug 5 18:47:06 2006
@@ -37,7 +37,8 @@
* @version $Rev$ $Date$
*/
public class LoginPropertiesFileTest extends AbstractTest {
-
+ private File basedir = new File(System.getProperty("basedir"));
+
protected AbstractName clientLM;
protected AbstractName clientCE;
protected AbstractName testCE;
@@ -74,8 +75,8 @@
gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
gbean.setAttribute("serverSide", Boolean.TRUE);
props = new Properties();
- props.put("usersURI", new File(new File("."), "src/test-data/data/users.properties").toURI().toString());
- props.put("groupsURI", new File(new File("."), "src/test-data/data/groups.properties").toURI().toString());
+ props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
+ props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
gbean.setAttribute("options", props);
gbean.setAttribute("loginDomainName", "TestProperties");
gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
Modified: geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java (original)
+++ geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/LoginSQLTest.java Sat Aug 5 18:47:06 2006
@@ -33,14 +33,16 @@
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Properties;
+import java.io.File;
/**
* @version $Rev$ $Date$
*/
public class LoginSQLTest extends AbstractTest {
-
- private static final String hsqldbURL = "jdbc:hsqldb:target/database/LoginSQLTest";
+ private File basedir = new File(System.getProperty("basedir"));
+ private String hsqldbURL = "jdbc:hsqldb:" + new File(basedir, "target/database/LoginSQLTest");
+
protected AbstractName sqlRealm;
protected AbstractName sqlModule;
Modified: geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java (original)
+++ geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/jaas/TimeoutTest.java Sat Aug 5 18:47:06 2006
@@ -37,7 +37,8 @@
* @version $Rev$ $Date$
*/
public class TimeoutTest extends AbstractTest {
-
+ private File basedir = new File(System.getProperty("basedir"));
+
protected AbstractName testCE;
protected AbstractName testRealm;
protected AbstractName clientLM;
@@ -58,8 +59,8 @@
gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
gbean.setAttribute("serverSide", Boolean.TRUE);
Properties props = new Properties();
- props.put("usersURI", new File(new File("."), "src/test-data/data/users.properties").toURI().toString());
- props.put("groupsURI", new File(new File("."), "src/test-data/data/groups.properties").toURI().toString());
+ props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
+ props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
gbean.setAttribute("options", props);
gbean.setAttribute("loginDomainName", "PropertiesDomain");
gbean.setAttribute("wrapPrincipals", Boolean.TRUE);
Modified: geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java (original)
+++ geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/network/protocol/SubjectCarryingProtocolTest.java Sat Aug 5 18:47:06 2006
@@ -58,9 +58,11 @@
* @version $Rev$ $Date$
*/
public class SubjectCarryingProtocolTest extends AbstractTest implements RequestListener {
-
+
final static private Log log = LogFactory.getLog(SubjectCarryingProtocolTest.class);
-
+
+ private File basedir = new File(System.getProperty("basedir"));
+
protected AbstractName testCE;
protected AbstractName testRealm;
@@ -119,8 +121,8 @@
gbean.setAttribute("loginModuleClass", "org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule");
gbean.setAttribute("serverSide", new Boolean(true));
Properties props = new Properties();
- props.put("usersURI", new File(new File("."), "src/test-data/data/users.properties").toURI().toString());
- props.put("groupsURI", new File(new File("."), "src/test-data/data/groups.properties").toURI().toString());
+ props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
+ props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
gbean.setAttribute("options", props);
gbean.setAttribute("loginDomainName", "PropertiesDomain");
kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
Modified: geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java (original)
+++ geronimo/branches/dain/notcm/modules/security/src/test/org/apache/geronimo/security/remoting/jmx/RemoteLoginTest.java Sat Aug 5 18:47:06 2006
@@ -61,6 +61,8 @@
* @version $Rev$ $Date$
*/
public class RemoteLoginTest extends TestCase {
+ private File basedir = new File(System.getProperty("basedir"));
+
Kernel kernel;
AbstractName serverInfo;
AbstractName loginService;
@@ -119,8 +121,8 @@
gbean.setAttribute("serverSide", Boolean.TRUE);
gbean.setAttribute("loginDomainName", "secret");
Properties props = new Properties();
- props.put("usersURI", new File(new File("."), "src/test-data/data/users.properties").toURI().toString());
- props.put("groupsURI", new File(new File("."), "src/test-data/data/groups.properties").toURI().toString());
+ props.put("usersURI", new File(basedir, "src/test-data/data/users.properties").toURI().toString());
+ props.put("groupsURI", new File(basedir, "src/test-data/data/groups.properties").toURI().toString());
gbean.setAttribute("options", props);
kernel.loadGBean(gbean, LoginModuleGBean.class.getClassLoader());
Modified: geronimo/branches/dain/notcm/modules/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/service-builder/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/service-builder/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/service-builder/pom.xml Sat Aug 5 18:47:06 2006
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -30,6 +30,20 @@
<artifactId>geronimo-service-builder</artifactId>
<name>Geronimo :: Service :: Builder</name>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/service-builder</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/service-builder</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/service-builder</url>
+ </scm>
+
<dependencies>
<!-- Module Dependencies -->
@@ -86,6 +100,32 @@
<configuration>
<sourceSchemas>geronimo-module-1.1.xsd,geronimo-javabean-xmlattribute-1.0.xsd</sourceSchemas>
</configuration>
+ </plugin>
+
+ <!--
+ HACK: Copy the generated XmlBeans bits for clover
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${pom.basedir}/target/clover/classes"/>
+ <copy todir="${pom.basedir}/target/clover/classes">
+ <fileset dir="${pom.basedir}/target/classes">
+ <include name="schemaorg_apache_xmlbeans/**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Propchange: geronimo/branches/dain/notcm/modules/service-builder/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/service-builder/src:424120
Modified: geronimo/branches/dain/notcm/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java (original)
+++ geronimo/branches/dain/notcm/modules/service-builder/src/test/org/apache/geronimo/deployment/service/ServiceConfigBuilderTest.java Sat Aug 5 18:47:06 2006
@@ -146,7 +146,6 @@
}
public SortedSet list(Artifact query) {
- System.out.println("LOOKING FOR "+query);
SortedSet set = new TreeSet();
if(query.getGroupId() != null && query.getArtifactId() != null && query.getVersion() != null && query.getType() == null) {
set.add(new Artifact(query.getGroupId(), query.getArtifactId(), query.getVersion(), "jar"));
Modified: geronimo/branches/dain/notcm/modules/system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/system/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,144 +17,182 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-system</artifactId>
- <packaging>jar</packaging>
<name>Geronimo :: System</name>
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/system</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/system</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/system</url>
+ </scm>
+
+ <dependencies>
+
+ <!-- Module Dependencies -->
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-common</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-util</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <!-- Thirdparty Dependencies -->
+
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ </dependency>
+
+ <!-- Test Dependencies -->
+
+ <!--
+ NOTE: Need to include Xerces for tests in case Crimson (or another parser)
+ gets picked up that does not support attributes
+ -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
<build>
+
<resources>
<resource>
- <directory>src/schema</directory>
+ <directory>${pom.basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
+ <resource>
+ <directory>${pom.basedir}/src/schema</directory>
<targetPath>META-INF/schema</targetPath>
</resource>
+
+ <!-- Include the dynamically generated resources (see below) -->
+ <resource>
+ <directory>${pom.basedir}/target/resources</directory>
+ </resource>
</resources>
- <testResources>
- <testResource>
- <directory>src/test-data</directory>
- </testResource>
- <testResource>
- <directory>src/schema</directory>
- <targetPath>META-INF/schema</targetPath>
- </testResource>
- </testResources>
-
+
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <systemProperties>
- <property>
- <name>java.io.tmpdir</name>
- <value>target/tmp</value>
- </property>
- </systemProperties>
- <workingDirectory>${basedir}</workingDirectory>
- <forkMode>once</forkMode>
- </configuration>
- </plugin>
-
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>exec-1</id>
- <phase>process-classes</phase>
+ <id>generate-dynamic-properties</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
<configuration>
<tasks>
<tstamp>
- <format property="build.date" pattern="yyyy.MM.dd" />
- <format property="build.time" pattern="HH:mm:ss.SSSZ" />
- <format property="build.year" pattern="yyyy" />
+ <format property="build.year" pattern="yyyy"/>
</tstamp>
- <echo file="${basedir}/target/classes/org/apache/geronimo/system/serverinfo/geronimo-version.properties">
-##### Generated by Maven2 ####
-version=${pom.version}
-build.date=${build.date}
-build.time=${build.time}
-copyright=Copyright (C) 2003-${build.year}, The Apache Software Foundation</echo>
- <echo file="${basedir}/target/classes/META-INF/product-versions.properties">
-#####Generated by Maven ####
-geronimo=${pom.version}
-activemq=${activemqVersion}
-openejb=${openejbVersion} tranql=${tranqlVersion}
-</echo>
+
+ <mkdir dir="${pom.basedir}/target/resources/org/apache/geronimo/system/serverinfo"/>
+
+ <propertyfile
+ file="${pom.basedir}/target/resources/org/apache/geronimo/system/serverinfo/geronimo-version.properties"
+ comment="Geronimo version information (generated, do not modify)">
+
+ <entry key="version" value="${pom.version}"/>
+ <entry key="build.date" type="date" value="now" pattern="yyyy.MM.dd"/>
+ <entry key="build.time" type="date" value="now" pattern="HH:mm:ss.SSSZ"/>
+ <entry key="copyright" value="Copyright (C) 2003-${build.year}, The Apache Software Foundation"/>
+ </propertyfile>
+
+ <mkdir dir="${pom.basedir}/target/resources/META-INF"/>
+
+ <propertyfile
+ file="${pom.basedir}/target/resources/META-INF/product-versions.properties"
+ comment="Product version information (generated, do not modify)">
+
+ <entry key="geronimo" value="${pom.version}"/>
+ <entry key="activemq" value="${activeMqVersion}"/>
+ <entry key="openejb" value="${openejbVersion}"/>
+ <entry key="tranql" value="${tranqlVersion}"/>
+ </propertyfile>
</tasks>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
+
<execution>
- <id>exec-2</id>
+ <id>test-resources</id>
<phase>generate-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
<configuration>
<tasks>
- <delete dir="${project.build.directory}/tmp" />
- <mkdir dir="${project.build.directory}/tmp" />
- <mkdir dir="${project.build.directory}/m1" />
- <mkdir dir="${project.build.directory}/m2" />
+ <delete dir="${project.build.directory}/tmp"/>
+ <mkdir dir="${project.build.directory}/tmp"/>
+ <mkdir dir="${project.build.directory}/m1"/>
+ <mkdir dir="${project.build.directory}/m2"/>
<copy todir="${project.build.directory}/m1">
- <fileset dir="${basedir}/src/test-repo/m1" />
+ <fileset dir="${basedir}/src/test-repo/m1"/>
</copy>
<copy todir="${project.build.directory}/m2">
- <fileset dir="${basedir}/src/test-repo/m2" />
+ <fileset dir="${basedir}/src/test-repo/m2"/>
</copy>
- <echo>******************The tests are being skipped************</echo>
</tasks>
</configuration>
- <goals>
- <goal>run</goal>
- </goals>
</execution>
</executions>
+
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- </dependency>
-
- </dependencies>
</project>
Propchange: geronimo/branches/dain/notcm/modules/system/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/system/src:427999
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java Sat Aug 5 18:47:06 2006
@@ -352,6 +352,9 @@
setNullAttribute(name);
}
else {
+ if (getNullAttribute(name)) {
+ nullAttributes.remove(name);
+ }
if(name.toLowerCase().indexOf("password") > -1) {
value = EncryptionManager.encrypt(value);
}
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java Sat Aug 5 18:47:06 2006
@@ -33,6 +33,7 @@
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.InvalidGBeanException;
+import org.apache.geronimo.kernel.util.XmlUtil;
import org.apache.geronimo.system.serverinfo.ServerInfo;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -365,7 +366,7 @@
FileInputStream fis = new FileInputStream(attributeFile);
InputSource in = new InputSource(fis);
in.setSystemId(attributeFile.toString());
- DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory dFactory = XmlUtil.newDocumentBuilderFactory();
try {
dFactory.setValidating(true);
dFactory.setNamespaceAware(true);
@@ -453,7 +454,7 @@
}
private static void saveXmlToFile(File file, ServerOverride serverOverride) {
- DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory dFactory = XmlUtil.newDocumentBuilderFactory();
dFactory.setValidating(true);
dFactory.setNamespaceAware(true);
dFactory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage",
@@ -464,7 +465,7 @@
try {
Document doc = dFactory.newDocumentBuilder().newDocument();
serverOverride.writeXml(doc);
- TransformerFactory xfactory = TransformerFactory.newInstance();
+ TransformerFactory xfactory = XmlUtil.newTransformerFactory();
Transformer xform = xfactory.newTransformer();
xform.setOutputProperty(OutputKeys.INDENT, "yes");
xform.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java Sat Aug 5 18:47:06 2006
@@ -75,6 +75,7 @@
import org.apache.geronimo.kernel.repository.Version;
import org.apache.geronimo.kernel.repository.WritableListableRepository;
import org.apache.geronimo.kernel.InvalidGBeanException;
+import org.apache.geronimo.kernel.util.XmlUtil;
import org.apache.geronimo.system.configuration.ConfigurationStoreUtil;
import org.apache.geronimo.system.configuration.GBeanOverride;
import org.apache.geronimo.system.configuration.PluginAttributeStore;
@@ -269,7 +270,7 @@
entry = new JarEntry(entry.getName());
out.putNextEntry(entry);
Document doc = writePluginMetadata(metadata);
- TransformerFactory xfactory = TransformerFactory.newInstance();
+ TransformerFactory xfactory = XmlUtil.newTransformerFactory();
Transformer xform = xfactory.newTransformer();
xform.setOutputProperty(OutputKeys.INDENT, "yes");
xform.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
@@ -313,7 +314,7 @@
}
}
Document doc = writePluginMetadata(metadata);
- TransformerFactory xfactory = TransformerFactory.newInstance();
+ TransformerFactory xfactory = XmlUtil.newTransformerFactory();
Transformer xform = xfactory.newTransformer();
xform.setOutputProperty(OutputKeys.INDENT, "yes");
xform.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
@@ -1055,7 +1056,7 @@
return null;
}
// Don't use the validating parser that we normally do
- DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ DocumentBuilder builder = XmlUtil.newDocumentBuilderFactory().newDocumentBuilder();
Document doc = builder.parse(in);
Element root = doc.getDocumentElement();
NodeList list = root.getElementsByTagName("versions");
@@ -1091,7 +1092,7 @@
*/
private void readNameAndID(File xml, Map plugins) {
try {
- SAXParserFactory factory = SAXParserFactory.newInstance();
+ SAXParserFactory factory = XmlUtil.newSAXParserFactory();
SAXParser parser = factory.newSAXParser();
PluginNameIDHandler handler = new PluginNameIDHandler();
parser.parse(xml, handler);
@@ -1112,7 +1113,7 @@
*/
private void readNameAndID(InputStream xml, Map plugins) {
try {
- SAXParserFactory factory = SAXParserFactory.newInstance();
+ SAXParserFactory factory = XmlUtil.newSAXParserFactory();
SAXParser parser = factory.newSAXParser();
PluginNameIDHandler handler = new PluginNameIDHandler();
parser.parse(xml, handler);
@@ -1243,7 +1244,7 @@
* @throws ParserConfigurationException
*/
private static DocumentBuilder createDocumentBuilder() throws ParserConfigurationException {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory factory = XmlUtil.newDocumentBuilderFactory();
factory.setValidating(true);
factory.setNamespaceAware(true);
factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage",
@@ -1351,7 +1352,7 @@
if (moduleId != null) {
artifact = Artifact.create(moduleId);
// Tests, etc. don't need to have a ConfigurationManager
- installed = configManager != null && configManager.isLoaded(artifact);
+ installed = configManager != null && configManager.isInstalled(artifact);
}
log.trace("Checking "+moduleId+": installed="+installed+", eligible="+eligible);
PluginMetadata data = new PluginMetadata(getChildText(plugin, "name"),
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/plugin/PluginMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/plugin/PluginMetadata.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/plugin/PluginMetadata.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/plugin/PluginMetadata.java Sat Aug 5 18:47:06 2006
@@ -18,6 +18,8 @@
import java.io.Serializable;
import java.net.URL;
+import java.util.List;
+import java.util.ArrayList;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.system.configuration.GBeanOverride;
@@ -96,6 +98,20 @@
}
/**
+ * Gets a description of this module in HTML format (with paragraph
+ * markers).
+ */
+ public String getHTMLDescription() {
+ String[] paras = splitParas(description);
+ StringBuffer buf = new StringBuffer();
+ for (int i = 0; i < paras.length; i++) {
+ String para = paras[i];
+ buf.append("<p>").append(para).append("</p>\n");
+ }
+ return buf.toString();
+ }
+
+ /**
* Gets a category name for this configuration. In a list, configurations
* in the same category will be listed together. There are no specific
* allowed values, though each repository may have standards for that.
@@ -348,5 +364,53 @@
}
return buf.toString();
}
+ }
+
+ private static String[] splitParas(String desc) {
+ int start = 0, last=0;
+ List list = new ArrayList();
+ boolean inSpace = false, multiple = false;
+ for(int i=0; i<desc.length(); i++) {
+ char c = desc.charAt(i);
+ if(inSpace) {
+ if(Character.isWhitespace(c)) {
+ if(c == '\r' || c == '\n') {
+ multiple = true;
+ for(int j=i+1; j<desc.length(); j++) {
+ char d = desc.charAt(j);
+ if(d != c && (d == '\r' || d == '\n')) {
+ i = j;
+ } else {
+ break;
+ }
+ }
+ }
+ } else {
+ if(multiple) {
+ list.add(desc.substring(last, start).trim());
+ last = i;
+ }
+ inSpace = false;
+ }
+ } else {
+ if(c == '\r' || c == '\n') {
+ inSpace = true;
+ multiple = false;
+ start = i;
+ for(int j=i+1; j<desc.length(); j++) {
+ char d = desc.charAt(j);
+ if(d != c && (d == '\r' || d == '\n')) {
+ i = j;
+ } else {
+ break;
+ }
+ }
+ }
+ }
+ }
+ if(last < desc.length()) {
+ list.add(desc.substring(last).trim());
+ }
+ return (String[]) list.toArray(new String[list.size()]);
}
}
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/repository/AbstractRepository.java Sat Aug 5 18:47:06 2006
@@ -41,6 +41,7 @@
import org.apache.geronimo.kernel.repository.ArtifactTypeHandler;
import org.apache.geronimo.kernel.repository.FileWriteMonitor;
import org.apache.geronimo.kernel.repository.WriteableRepository;
+import org.apache.geronimo.kernel.util.XmlUtil;
import org.apache.geronimo.system.serverinfo.ServerInfo;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -125,7 +126,7 @@
try {
if (is != null) {
InputSource in = new InputSource(is);
- DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory dfactory = XmlUtil.newDocumentBuilderFactory();
dfactory.setNamespaceAware(true);
try {
Document doc = dfactory.newDocumentBuilder().parse(in);
@@ -231,7 +232,11 @@
ArtifactTypeHandler typeHandler = (ArtifactTypeHandler) typeHandlers.get(destination.getType());
if (typeHandler == null) typeHandler = DEFAULT_TYPE_HANDLER;
typeHandler.install(source, size, destination, monitor, location);
-
+
+ //
+ // FIXME: This should not be here... if you need this intel then add logging
+ //
+
if (destination.getType().equalsIgnoreCase("car")) {
System.out.println("############################################################");
System.out.println("# Installed configuration");
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerConstants.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerConstants.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerConstants.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerConstants.java Sat Aug 5 18:47:06 2006
@@ -68,28 +68,35 @@
static {
Properties versionInfo = new Properties();
try {
- versionInfo.load(ServerConstants.class.getClassLoader().getResourceAsStream("org/apache/geronimo/system/serverinfo/geronimo-version.properties"));
- } catch (java.io.IOException e) {
- throw new ExceptionInInitializerError(new Exception("Could not load geronimo-version.properties", e));
+ java.io.InputStream input = ServerConstants.class.getClassLoader().getResourceAsStream("org/apache/geronimo/system/serverinfo/geronimo-version.properties");
+ if (input == null) {
+ throw new Error("Missing geronimo-version.properties");
+ }
+
+ versionInfo.load(input);
}
+ catch (java.io.IOException e) {
+ throw new Error("Could not load geronimo-version.properties", e);
+ }
+
VERSION = versionInfo.getProperty("version");
if (VERSION == null || VERSION.length() == 0) {
- throw new ExceptionInInitializerError("geronimo-version.properties does not contain a 'version' property");
+ throw new Error("geronimo-version.properties does not contain a 'version' property");
}
BUILD_DATE = versionInfo.getProperty("build.date");
if (BUILD_DATE == null || BUILD_DATE.length() == 0) {
- throw new ExceptionInInitializerError("geronimo-version.properties does not contain a 'build.date' property");
+ throw new Error("geronimo-version.properties does not contain a 'build.date' property");
}
BUILD_TIME = versionInfo.getProperty("build.time");
if (BUILD_TIME == null || BUILD_TIME.length() == 0) {
- throw new ExceptionInInitializerError("geronimo-version.properties does not contain a 'build.time' property");
+ throw new Error("geronimo-version.properties does not contain a 'build.time' property");
}
COPYRIGHT = versionInfo.getProperty("copyright");
if (COPYRIGHT == null || COPYRIGHT.length() == 0) {
- throw new ExceptionInInitializerError("geronimo-version.properties does not contain a 'copyright' property");
+ throw new Error("geronimo-version.properties does not contain a 'copyright' property");
}
}
}
Modified: geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/util/PluginRepositoryExporter.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/util/PluginRepositoryExporter.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/util/PluginRepositoryExporter.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/java/org/apache/geronimo/system/util/PluginRepositoryExporter.java Sat Aug 5 18:47:06 2006
@@ -40,6 +40,7 @@
import org.apache.geronimo.kernel.config.IOUtil;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.repository.Version;
+import org.apache.geronimo.kernel.util.XmlUtil;
import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
import org.apache.geronimo.system.configuration.ConfigurationStoreUtil;
import org.apache.geronimo.system.configuration.GBeanOverride;
@@ -237,7 +238,7 @@
}
Map plugins = installer.getInstalledPlugins();
Document doc = generateConfigFile(installer, plugins.values());
- TransformerFactory xfactory = TransformerFactory.newInstance();
+ TransformerFactory xfactory = XmlUtil.newTransformerFactory();
Transformer xform = xfactory.newTransformer();
xform.setOutputProperty(OutputKeys.INDENT, "yes");
xform.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
@@ -291,7 +292,7 @@
private void updateMavenMetadata(File dir, Artifact artifact) throws TransformerException, IOException, SAXException, ParserConfigurationException {
File mavenFile = new File(dir, "maven-metadata.xml");
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory factory = XmlUtil.newDocumentBuilderFactory();
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc;
if(mavenFile.exists()) {
@@ -323,7 +324,7 @@
newVersion.appendChild(doc.createTextNode(artifact.getVersion().toString()));
versionsElement.appendChild(newVersion);
}
- TransformerFactory xfactory = TransformerFactory.newInstance();
+ TransformerFactory xfactory = XmlUtil.newTransformerFactory();
Transformer xform = xfactory.newTransformer();
xform.setOutputProperty(OutputKeys.INDENT, "yes");
xform.transform(new DOMSource(doc), new StreamResult(mavenFile));
@@ -344,7 +345,7 @@
private Document generateConfigFile(PluginInstaller installer, Collection plugins) throws ParserConfigurationException {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory factory = XmlUtil.newDocumentBuilderFactory();
factory.setNamespaceAware(true);
factory.setValidating(true);
factory.setAttribute("http://java.sun.com/xml/jaxp/properties/schemaLanguage",
Modified: geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/configuration/ConfigurationStoreUtilTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/configuration/ConfigurationStoreUtilTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/configuration/ConfigurationStoreUtilTest.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/configuration/ConfigurationStoreUtilTest.java Sat Aug 5 18:47:06 2006
@@ -28,6 +28,7 @@
* @version $Rev$ $Date$
*/
public class ConfigurationStoreUtilTest extends TestCase {
+ private File basedir = new File(System.getProperty("basedir"));
private File testFile;
private static final String BAD_SUM = "Stinky Cheese";
private File sumFile;
@@ -123,7 +124,7 @@
protected void setUp() throws Exception {
super.setUp();
- testFile = new File("target/checksumTest/test.data");
+ testFile = new File(basedir, "target/checksumTest/test.data");
testFile.getParentFile().mkdirs();
FileWriter writer = new FileWriter(testFile);
writer.write("lflkfjkljkldfaskljsadflkjasdflweoiurhlmvniouwehnflikmnfubhgkajnbfgk;ausuhfoubhr\n");
Modified: geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/configuration/ServerOverrideTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/configuration/ServerOverrideTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/configuration/ServerOverrideTest.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/configuration/ServerOverrideTest.java Sat Aug 5 18:47:06 2006
@@ -20,6 +20,7 @@
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.ReferencePatterns;
import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.util.XmlUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -31,13 +32,11 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.Transformer;
import javax.xml.transform.OutputKeys;
-import javax.xml.transform.TransformerException;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.dom.DOMSource;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import java.io.PrintWriter;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
@@ -45,10 +44,15 @@
import java.util.Map;
import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* @version $Rev$ $Date$
*/
public class ServerOverrideTest extends TestCase {
+ private static final Log log = LogFactory.getLog(ServerOverrideTest.class);
+
public void testBasics() throws Exception {
GBeanOverride pizza = new GBeanOverride("Pizza", true);
assertTrue(pizza.isLoad());
@@ -282,7 +286,7 @@
}
private Element parseXml(InputStream in, String name) throws Exception {
- DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory documentBuilderFactory = XmlUtil.newDocumentBuilderFactory();
Document doc = documentBuilderFactory.newDocumentBuilder().parse(in);
Element elem = doc.getDocumentElement();
if(elem.getNodeName().equals(name)) {
@@ -293,21 +297,19 @@
}
private Document createDocument() throws ParserConfigurationException {
- DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilderFactory dFactory = XmlUtil.newDocumentBuilderFactory();
dFactory.setValidating(false);
return dFactory.newDocumentBuilder().newDocument();
}
private Element readElement(Element e, String name) throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
- TransformerFactory xfactory = TransformerFactory.newInstance();
+ TransformerFactory xfactory = XmlUtil.newTransformerFactory();
Transformer xform = xfactory.newTransformer();
xform.setOutputProperty(OutputKeys.INDENT, "yes");
xform.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
xform.transform(new DOMSource(e), new StreamResult(out));
- System.out.println();
- System.out.println();
- System.out.println(new String(out.toByteArray()));
+ log.debug(new String(out.toByteArray()));
ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
return parseXml(in, name);
}
Modified: geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java Sat Aug 5 18:47:06 2006
@@ -75,6 +75,8 @@
public void testParsing() throws Exception {
PluginList list = installer.listPlugins(testRepo, null, null);
+ assertNotNull(list);
+
assertEquals(1, list.getRepositories().length);
assertEquals(fakeRepo, list.getRepositories()[0]);
assertTrue(list.getPlugins().length > 0);
Modified: geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/AbstractRepositoryTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/AbstractRepositoryTest.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/AbstractRepositoryTest.java Sat Aug 5 18:47:06 2006
@@ -26,10 +26,15 @@
import org.apache.geronimo.kernel.repository.ListableRepository;
import org.apache.geronimo.kernel.repository.Version;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* @version $Rev$ $Date$
*/
public class AbstractRepositoryTest extends TestCase {
+ private static final Log log = LogFactory.getLog(AbstractRepositoryTest.class);
+
protected ListableRepository repository;
protected File rootRepoDir;
@@ -78,7 +83,7 @@
public void testListAll() {
SortedSet artifacts = repository.list();
- System.out.println("Matched artifacts: "+artifacts);
+ log.debug("Matched artifacts: "+artifacts);
assertTrue(artifacts.contains(new Artifact("org.foo", "test", "2.0.1", "properties")));
assertFalse(artifacts.contains(new Artifact("Unknown", "artifact", "2.0.1", "properties")));
Modified: geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/Maven1RepositoryTest.java Sat Aug 5 18:47:06 2006
@@ -22,8 +22,10 @@
* @version $Rev$ $Date$
*/
public class Maven1RepositoryTest extends AbstractRepositoryTest {
+ private File basedir = new File(System.getProperty("basedir"));
+
protected void setUp() throws Exception {
- rootRepoDir = new File("target/m1");
+ rootRepoDir = new File(basedir, "target/m1");
repository = new Maven1Repository(rootRepoDir);
super.setUp();
}
Modified: geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/repository/Maven2RepositoryTest.java Sat Aug 5 18:47:06 2006
@@ -22,8 +22,10 @@
* @version $Rev$ $Date$
*/
public class Maven2RepositoryTest extends AbstractRepositoryTest {
+ private File basedir = new File(System.getProperty("basedir"));
+
protected void setUp() throws Exception {
- rootRepoDir = new File("target/m2");
+ rootRepoDir = new File(basedir, "target/m2");
repository = new Maven2Repository(rootRepoDir);
super.setUp();
}
Modified: geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java (original)
+++ geronimo/branches/dain/notcm/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java Sat Aug 5 18:47:06 2006
@@ -27,13 +27,17 @@
import junit.framework.TestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
/**
* Unit tests for {@link RMIClassLoaderSpiImpl} class.
*
* @version $Rev$ $Date$
*/
-public class RMIClassLoaderSpiImplTest
- extends TestCase {
+public class RMIClassLoaderSpiImplTest extends TestCase {
+ private static final Log log = LogFactory.getLog(RMIClassLoaderSpiImplTest.class);
+
private String baseURL;
private String normalizedBaseURL;
@@ -50,8 +54,8 @@
normalizedBaseURL = normalizedBaseURL.substring(0, normalizedBaseURL.length() - 1);
}
- System.out.println("Using base URL: " + baseURL);
- System.out.println("Using normalized base URL: " + normalizedBaseURL);
+ log.debug("Using base URL: " + baseURL);
+ log.debug("Using normalized base URL: " + normalizedBaseURL);
}
public void testNormalizeURL() throws MalformedURLException {
Modified: geronimo/branches/dain/notcm/modules/test-ddbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/test-ddbean/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/test-ddbean/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/test-ddbean/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,20 +17,34 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-test-ddbean</artifactId>
<name>Geronimo :: Test :: DDBeans</name>
- <description>Geronimo Test DDBeans</description>
-
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/test-ddbean</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/test-ddbean</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/test-ddbean</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>xmlbeans</groupId>
@@ -59,5 +73,6 @@
<version>${pom.version}</version>
</dependency>
</dependencies>
+
</project>
Modified: geronimo/branches/dain/notcm/modules/timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/timer/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/timer/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/timer/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,20 +17,44 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-timer</artifactId>
<name>Geronimo :: Timer</name>
- <description>Geronimo Timer</description>
-
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/timer</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/timer</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/timer</url>
+ </scm>
+
+ <properties>
+ <!--
+ FIXME: Disable the timer tests for now since they can fail if the host environment
+ does not have enough free CPU cycles to trigger enough timer invocations.
+
+ https://issues.apache.org/jira/browse/GERONIMO-2183
+ -->
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -105,5 +129,6 @@
<artifactId>commons-logging</artifactId>
</dependency>
</dependencies>
+
</project>
Modified: geronimo/branches/dain/notcm/modules/tomcat-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/tomcat-builder/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/tomcat-builder/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/tomcat-builder/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,12 +17,13 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -30,11 +31,19 @@
<artifactId>geronimo-tomcat-builder</artifactId>
<name>Geronimo :: Tomcat :: Builder</name>
- <properties>
- <buildDir>${project.build.directory}</buildDir>
- <endorsedDir>${buildDir}/endorsed</endorsedDir>
- <localRepoDir>${settings.localRepository}</localRepoDir>
- </properties>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/tomcat-builder</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/tomcat-builder</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/tomcat-builder</url>
+ </scm>
<dependencies>
@@ -130,9 +139,17 @@
</dependencies>
<build>
- <!-- move this to parent pom -->
<resources>
<resource>
+ <directory>${pom.basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
+ <resource>
<directory>src/schema</directory>
<targetPath>META-INF</targetPath>
<includes>
@@ -147,11 +164,15 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
- <java.endorsed.dirs>${endorsedDir}</java.endorsed.dirs>
- <java.security.auth.login.config>src/test-resources/data/login.config</java.security.auth.login.config>
- <user.dir>${basedir}</user.dir>
+ <property>
+ <name>java.endorsed.dirs</name>
+ <value>${project.build.directory}/endorsed</value>
+ </property>
+ <property>
+ <name>java.security.auth.login.config</name>
+ <value>src/test-resources/data/login.config</value>
+ </property>
</systemProperties>
- <forkMode>once</forkMode>
</configuration>
</plugin>
@@ -162,30 +183,53 @@
<sourceSchemas>geronimo-tomcat-1.1.xsd,geronimo-tomcat-config-1.0.xsd</sourceSchemas>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+
<executions>
+ <!--
+ HACK: Copy the generated XmlBeans bits for clover
+ -->
+ <execution>
+ <id>copy-xmlbeans-for-clover</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${pom.basedir}/target/clover/classes"/>
+ <copy todir="${pom.basedir}/target/clover/classes">
+ <fileset dir="${pom.basedir}/target/classes">
+ <include name="schemaorg_apache_xmlbeans/**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+
<execution>
+ <id>setup-test-environment</id>
<phase>process-test-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
- <copy todir="${buildDir}/var/catalina/conf" file="src/var/web.xml" />
- <copy todir="${buildDir}/var/catalina/webapps">
+ <copy todir="${project.build.directory}/var/catalina/conf" file="src/var/web.xml"/>
+ <copy todir="${project.build.directory}/var/catalina/webapps">
<fileset dir="src/test-resources/deployables">
- <include name="war1/**" />
- <include name="war3/**" />
- <include name="war4/**" />
+ <include name="war1/**"/>
+ <include name="war3/**"/>
+ <include name="war4/**"/>
</fileset>
</copy>
- <copy todir="${endorsedDir}" flatten="true">
- <fileset dir="${localRepoDir}">
- <include name="xerces/xercesImpl/${xercesVersion}/*.jar" />
- <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar" />
+ <copy todir="${project.build.directory}/endorsed" flatten="true">
+ <fileset dir="${settings.localRepository}">
+ <include name="xerces/xercesImpl/${xercesVersion}/*.jar"/>
+ <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar"/>
</fileset>
</copy>
</tasks>
Propchange: geronimo/branches/dain/notcm/modules/tomcat-builder/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/src:424119
Modified: geronimo/branches/dain/notcm/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java (original)
+++ geronimo/branches/dain/notcm/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java Sat Aug 5 18:47:06 2006
@@ -58,7 +58,6 @@
ref.setResourceLink("target");
SchemaConversionUtils.validateDD(tomcatWebAppType);
-// System.out.println(tomcatWebAppType.toString());
}
}
Modified: geronimo/branches/dain/notcm/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/branches/dain/notcm/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Sat Aug 5 18:47:06 2006
@@ -139,8 +139,7 @@
}
private WebModuleInfo deployWar(String warName) throws Exception {
- File outputPath = new File(basedir,
- "target/test-resources/deployables/" + warName);
+ File outputPath = new File(basedir, "target/test-resources/deployables/" + warName);
recursiveDelete(outputPath);
outputPath.mkdirs();
File path = new File(basedir, "src/test-resources/deployables/" + warName);
@@ -349,7 +348,7 @@
WebServiceBuilder webServiceBuilder = new UnavailableWebServiceBuilder();
GBeanData containerData = bootstrap.addGBean("TomcatContainer", TomcatContainer.GBEAN_INFO);
- containerData.setAttribute("catalinaHome", "target/var/catalina");
+ containerData.setAttribute("catalinaHome", new File(basedir, "target/var/catalina").toString());
containerData.setReferencePattern("EngineGBean", engine.getAbstractName());
containerData.setReferencePattern("ServerInfo", serverInfo.getAbstractName());
AbstractName containerName = containerData.getAbstractName();
Modified: geronimo/branches/dain/notcm/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/tomcat/pom.xml?rev=429088&r1=429087&r2=429088&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/tomcat/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/tomcat/pom.xml Sat Aug 5 18:47:06 2006
@@ -17,80 +17,39 @@
<!-- $Rev$ $Date$ -->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-tomcat</artifactId>
<name>Geronimo :: Tomcat</name>
- <description>Geronimo Tomcat integration</description>
-
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/trunk/modules/tomcat</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/trunk/modules/tomcat</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/trunk/modules/tomcat</url>
+ </scm>
+
<properties>
- <buildDir>${project.build.directory}</buildDir>
- <endorsedDir>${buildDir}/endorsed</endorsedDir>
+ <endorsedDir>${project.build.directory}/endorsed</endorsedDir>
<localRepoDir>${settings.localRepository}</localRepoDir>
</properties>
-
- <build>
- <resources>
- <resource>
- <directory>src/resources2</directory>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>java.endorsed.dirs</name>
- <value>${endorsedDir}</value>
- </property>
- </systemProperties>
- <forkMode>pertest</forkMode>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy todir="target/var/catalina/conf" file="src/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml" />
- <copy todir="target/var/catalina/webapps">
- <fileset dir="src/test-resources/deployables">
- <include name="war1/**" />
- <include name="war3/**" />
- </fileset>
- </copy>
- <copy todir="${endorsedDir}" flatten="true">
- <fileset dir="${localRepoDir}">
- <include name="xerces/xercesImpl/${xercesVersion}/*.jar" />
- <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -304,6 +263,55 @@
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>java.endorsed.dirs</name>
+ <value>${endorsedDir}</value>
+ </property>
+ </systemProperties>
+
+ <forkMode>pertest</forkMode>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy todir="target/var/catalina/conf" file="src/resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml" />
+ <copy todir="target/var/catalina/webapps">
+ <fileset dir="src/test-resources/deployables">
+ <include name="war1/**" />
+ <include name="war3/**" />
+ </fileset>
+ </copy>
+ <copy todir="${endorsedDir}" flatten="true">
+ <fileset dir="${localRepoDir}">
+ <include name="xerces/xercesImpl/${xercesVersion}/*.jar" />
+ <include name="xml-apis/xml-apis/${xmlApisVersion}/*.jar" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Propchange: geronimo/branches/dain/notcm/modules/tomcat/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Sat Aug 5 18:47:06 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/tomcat/src:424119