[jboss-cvs] JBossAS SVN: r80806 - in projects/jboss-aspects/tags: jboss-remoting-aspects-1.0.1.GA and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 11 11:38:48 EST 2008
Author: ALRubinger
Date: 2008-11-11 11:38:48 -0500 (Tue, 11 Nov 2008)
New Revision: 80806
Added:
projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/
projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/pom.xml
projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/src/test/java/org/jboss/aspects/remoting/test/common/Fork.java
Removed:
projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/pom.xml
projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/src/test/java/org/jboss/aspects/remoting/test/common/Fork.java
Log:
[maven-release-plugin] copy for tag jboss-remoting-aspects-1.0.1.GA
Copied: projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA (from rev 80796, projects/jboss-aspects/trunk/remoting)
Deleted: projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/pom.xml
===================================================================
--- projects/jboss-aspects/trunk/remoting/pom.xml 2008-11-11 15:10:15 UTC (rev 80796)
+++ projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/pom.xml 2008-11-11 16:38:48 UTC (rev 80806)
@@ -1,170 +0,0 @@
-<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">
- <parent>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-aspects-build</artifactId>
- <version>1.0.1.CR2</version>
- <relativePath>../build</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-remoting-aspects</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JBoss Remoting Aspects</name>
- <url>http://www.jboss.org/jbossas</url>
- <description>JBoss Remoting Aspects</description>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-aspects/trunk/remoting</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-aspects/trunk/remoting</developerConnection>
- <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-aspects/trunk/remoting</url>
- </scm>
-
- <build>
-
- <sourceDirectory>src/main/java</sourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
-
- <plugins>
-
- <!-- Surefire (Tests) Plugin -->
-
- <!--
-
- To pass JVM Arguments (ie. Remote Debugging w/ suspend),
- pass "maven.surefire.debug" as system property, ie:
-
- mvn test -Dmaven.surefire.debug="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8787"
-
- -->
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- SUREFIRE-510: surefire.test.class.path is not set when forkMode is always -->
- <version>2.4.3</version>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <printSummary>true</printSummary>
- <!-- To allow override from the command line, see SUREFIRE-319 -->
- <testFailureIgnore>${maven.test.failure.ignore}</testFailureIgnore>
- <includes>
- <include>**/*TestCase.java</include>
- <include>**/*TestSuite.java</include>
- </includes>
- <forkMode>always</forkMode>
- <argLine>-ea</argLine>
- </configuration>
- </plugin>
-
- </plugins>
-
-
- </build>
-
- <dependencyManagement>
- <dependencies>
- <!-- Because of a bug in m2eclipse the version of reflect must be explicitly defined -->
- <!--
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- <version>2.0.0.Beta12</version>
- </dependency>
- -->
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <!-- TODO: who should declare this dependency? -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-serialization</artifactId>
- <version>1.0.3.GA</version>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- </dependency>
-
- <!-- TODO: who should define this dependency? -->
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4-jboss-update1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>2.0.5.GA</version>
- <scope>test</scope>
- </dependency>
-
- <!-- MC doesn't declare this as a proper dependency -->
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- <version>2.0.0.Beta12</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <version>5.0.0.CR1</version>
- <scope>test</scope>
- </dependency>
-
- <!-- JBASPECT-3
- Dependencies below this line should be removed
- -->
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-transaction-aspects</artifactId>
- <version>1.0.0.Beta1</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-security-aspects</artifactId>
- <version>1.0.0.Beta1</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>2.0.0.Beta16</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
\ No newline at end of file
Copied: projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/pom.xml (from rev 80805, projects/jboss-aspects/trunk/remoting/pom.xml)
===================================================================
--- projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/pom.xml (rev 0)
+++ projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/pom.xml 2008-11-11 16:38:48 UTC (rev 80806)
@@ -0,0 +1,187 @@
+<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">
+ <parent>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-aspects-build</artifactId>
+ <version>1.0.1.CR2</version>
+ <relativePath>../build</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jboss-remoting-aspects</artifactId>
+ <version>1.0.1.GA</version>
+ <packaging>jar</packaging>
+ <name>JBoss Remoting Aspects</name>
+ <url>http://www.jboss.org/jbossas</url>
+ <description>JBoss Remoting Aspects</description>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA</developerConnection>
+ <url>http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA</url>
+ </scm>
+
+ <build>
+
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+
+ <plugins>
+
+ <!-- Build a CP File for use in tests -->
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>build-cp-file</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>build-classpath</goal>
+ </goals>
+ <configuration>
+ <outputFile>target/cp.txt</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Surefire (Tests) Plugin -->
+
+ <!--
+
+ To pass JVM Arguments (ie. Remote Debugging w/ suspend),
+ pass "maven.surefire.debug" as system property, ie:
+
+ mvn test -Dmaven.surefire.debug="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8787"
+
+ -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!-- SUREFIRE-510: surefire.test.class.path is not set when forkMode is always -->
+ <version>2.4.3</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <printSummary>true</printSummary>
+ <!-- To allow override from the command line, see SUREFIRE-319 -->
+ <testFailureIgnore>${maven.test.failure.ignore}</testFailureIgnore>
+ <includes>
+ <include>**/*TestCase.java</include>
+ <include>**/*TestSuite.java</include>
+ </includes>
+ <forkMode>always</forkMode>
+ <argLine>-ea</argLine>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Because of a bug in m2eclipse the version of reflect must be explicitly defined -->
+ <!--
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>2.0.0.Beta12</version>
+ </dependency>
+ -->
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <!-- TODO: who should declare this dependency? -->
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <version>1.0.3.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </dependency>
+
+ <!-- TODO: who should define this dependency? -->
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-jboss-update1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>2.0.5.GA</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- MC doesn't declare this as a proper dependency -->
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <version>2.0.0.Beta12</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ <version>5.0.0.CR1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- JBASPECT-3
+ Dependencies below this line should be removed
+ -->
+ <dependency>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-transaction-aspects</artifactId>
+ <version>1.0.0.Beta1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-security-aspects</artifactId>
+ <version>1.0.0.Beta1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>2.0.0.Beta16</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
\ No newline at end of file
Deleted: projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/src/test/java/org/jboss/aspects/remoting/test/common/Fork.java
===================================================================
--- projects/jboss-aspects/trunk/remoting/src/test/java/org/jboss/aspects/remoting/test/common/Fork.java 2008-11-11 15:10:15 UTC (rev 80796)
+++ projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/src/test/java/org/jboss/aspects/remoting/test/common/Fork.java 2008-11-11 16:38:48 UTC (rev 80806)
@@ -1,107 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.aspects.remoting.test.common;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.jboss.logging.Logger;
-
-/**
- * Fork off a process and run the specified class.
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class Fork
-{
- private static final Logger log = Logger.getLogger(Fork.class);
-
- private Process p;
- private Thread errorStreamReader;
- private Thread inputStreamReader;
-
- public Fork(Class<?> cls) throws IOException
- {
- this(cls.getName());
- }
-
- public Fork(String className) throws IOException
- {
- String java = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
- // make sure we can run under surefire
- String classPath = System.getProperty("surefire.test.class.path");
- if(classPath == null)
- classPath = System.getProperty("java.class.path");
- log.debug("classPath = " + classPath);
- String cmdarray[] = { java, "-cp", classPath, className };
- p = Runtime.getRuntime().exec(cmdarray);
-
- final InputStream in = p.getInputStream();
- inputStreamReader = new Thread()
- {
- @Override
- public void run()
- {
- try
- {
- int b;
- while((b = in.read()) != -1)
- System.out.write(b);
- }
- catch(IOException e)
- {
- e.printStackTrace();
- }
- }
- };
- inputStreamReader.setDaemon(true);
- inputStreamReader.start();
-
- final InputStream err = p.getErrorStream();
- errorStreamReader = new Thread()
- {
- @Override
- public void run()
- {
- try
- {
- int b;
- while((b = err.read()) != -1)
- System.err.write(b);
- }
- catch(IOException e)
- {
- e.printStackTrace();
- }
- }
- };
- errorStreamReader.setDaemon(true);
- errorStreamReader.start();
- }
-
- public void kill()
- {
- p.destroy();
- }
-}
Copied: projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/src/test/java/org/jboss/aspects/remoting/test/common/Fork.java (from rev 80801, projects/jboss-aspects/trunk/remoting/src/test/java/org/jboss/aspects/remoting/test/common/Fork.java)
===================================================================
--- projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/src/test/java/org/jboss/aspects/remoting/test/common/Fork.java (rev 0)
+++ projects/jboss-aspects/tags/jboss-remoting-aspects-1.0.1.GA/src/test/java/org/jboss/aspects/remoting/test/common/Fork.java 2008-11-11 16:38:48 UTC (rev 80806)
@@ -0,0 +1,157 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.aspects.remoting.test.common;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.jboss.logging.Logger;
+
+/**
+ * Fork off a process and run the specified class.
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+public class Fork
+{
+ private static final Logger log = Logger.getLogger(Fork.class);
+
+ private static final String LOCATION_BASEDIR = System.getProperty("basedir");
+
+ private static final String LOCATION_TARGET = Fork.LOCATION_BASEDIR + File.separator + "target";
+
+ private static final String LOCATION_TARGET_MAIN = Fork.LOCATION_TARGET + File.separator + "classes";
+
+ private static final String LOCATION_TARGET_TESTS = Fork.LOCATION_TARGET + File.separator + "tests-classes";
+
+ private static final String FILENAME_DEPENDENCY_CP = Fork.LOCATION_TARGET + File.separator
+ + "cp.txt";
+
+ private Process p;
+ private Thread errorStreamReader;
+ private Thread inputStreamReader;
+
+ public Fork(Class<?> cls) throws IOException
+ {
+ this(cls.getName());
+ }
+
+ public Fork(String className) throws IOException
+ {
+ String java = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
+
+ String depCp = null;
+
+ // Get the contents of the dependency classpath file
+ String dependencyClasspathFilename = Fork.FILENAME_DEPENDENCY_CP;
+ File dependencyClasspath = new File(dependencyClasspathFilename);
+ if (dependencyClasspath.exists())
+ {
+ BufferedReader reader = new BufferedReader(new FileReader(dependencyClasspath));
+ StringBuffer contents = new StringBuffer();
+ String line = null;
+ while ((line = reader.readLine()) != null)
+ {
+ contents.append(line);
+ }
+
+ // Append "target" binaries
+ contents.append(File.pathSeparatorChar);
+ contents.append(Fork.LOCATION_TARGET_TESTS);
+ contents.append(File.pathSeparatorChar);
+ contents.append(Fork.LOCATION_TARGET_MAIN);
+ contents.append(File.separatorChar);
+
+ depCp = contents.toString().trim();
+ }
+ // No dependency CP file found
+ else
+ {
+ log.debug("Could not find dependency CP at: " + dependencyClasspathFilename);
+ }
+
+ // If there was no dependency CP file, try to get from system properties
+ if (depCp == null)
+ {
+ depCp = System.getProperty("surefire.test.class.path");
+ if (depCp == null)
+ depCp = System.getProperty("java.class.path");
+ log.debug("classPath = " + depCp);
+ }
+
+ String cmdarray[] =
+ {java, "-cp", depCp, className};
+ log.debug("Forking: " + cmdarray);
+ p = Runtime.getRuntime().exec(cmdarray);
+
+ final InputStream in = p.getInputStream();
+ inputStreamReader = new Thread()
+ {
+ @Override
+ public void run()
+ {
+ try
+ {
+ int b;
+ while((b = in.read()) != -1)
+ System.out.write(b);
+ }
+ catch(IOException e)
+ {
+ e.printStackTrace();
+ }
+ }
+ };
+ inputStreamReader.setDaemon(true);
+ inputStreamReader.start();
+
+ final InputStream err = p.getErrorStream();
+ errorStreamReader = new Thread()
+ {
+ @Override
+ public void run()
+ {
+ try
+ {
+ int b;
+ while((b = err.read()) != -1)
+ System.err.write(b);
+ }
+ catch(IOException e)
+ {
+ e.printStackTrace();
+ }
+ }
+ };
+ errorStreamReader.setDaemon(true);
+ errorStreamReader.start();
+ }
+
+ public void kill()
+ {
+ p.destroy();
+ }
+}
More information about the jboss-cvs-commits
mailing list