[jboss-svn-commits] JBoss Common SVN: r2820 - common-logging-jdk/trunk.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 8 09:50:21 EDT 2008
Author: dimitris at jboss.org
Date: 2008-04-08 09:50:21 -0400 (Tue, 08 Apr 2008)
New Revision: 2820
Removed:
common-logging-jdk/trunk/pom-jdk14.xml
Modified:
common-logging-jdk/trunk/.classpath
common-logging-jdk/trunk/.project
common-logging-jdk/trunk/pom.xml
common-logging-jdk/trunk/projectSet.psf
Log:
JBLOGGING-2, Move jboss:jboss-common-logging-jdk to org.jboss.logging:jboss-logging-jdk, tidy up the dependencies
Modified: common-logging-jdk/trunk/.classpath
===================================================================
--- common-logging-jdk/trunk/.classpath 2008-04-08 13:26:09 UTC (rev 2819)
+++ common-logging-jdk/trunk/.classpath 2008-04-08 13:50:21 UTC (rev 2820)
@@ -1,7 +1,7 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="/common-core"/>
- <classpathentry kind="src" path="/common-logging-spi"/>
+ <classpathentry kind="src" path="/jboss-logging-spi"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified: common-logging-jdk/trunk/.project
===================================================================
--- common-logging-jdk/trunk/.project 2008-04-08 13:26:09 UTC (rev 2819)
+++ common-logging-jdk/trunk/.project 2008-04-08 13:50:21 UTC (rev 2820)
@@ -1,6 +1,6 @@
<projectDescription>
- <name>jboss-common-logging-jdk</name>
- <comment>JBoss Common Logging JDK Implementation</comment>
+ <name>jboss-logging-jdk</name>
+ <comment>JBoss Logging JDK Implementation</comment>
<projects/>
<buildSpec>
<buildCommand>
Deleted: common-logging-jdk/trunk/pom-jdk14.xml
===================================================================
--- common-logging-jdk/trunk/pom-jdk14.xml 2008-04-08 13:26:09 UTC (rev 2819)
+++ common-logging-jdk/trunk/pom-jdk14.xml 2008-04-08 13:50:21 UTC (rev 2820)
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- - Notes for building and running tests.
- - Do to some limitations of the maven surefire plugin, the tests must
- - occur in a separate lifecycle from the build.
- -
- - mvn -f pom-jdk14.xml install - This will build the jdk14 version of the project.
- - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test - This will run the tests using a jdk1.4 jvm
- - Note: the tests will not work by calling mvn test, it must be performed by calling surefire directly.
- -->
-<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</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-common-logging-jdk-jdk14</artifactId>
- <version>2.0.5-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>JBoss Logging JDK</name>
- <url>http://www.jboss.org</url>
- <description>JBoss Common Logging JDK Implementation</description>
- <scm>
- <connection>scm:svn:https://svn.jboss.org/repos/common/common-logging-jdk/trunk/</connection>
- </scm>
- <build>
- <outputDirectory>${mainOutputDir}</outputDirectory>
- <testOutputDirectory>${testOutputDir}</testOutputDirectory>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <!-- The tagBase property is needed during the release process so that the maven release plugin
- will create the release tag in the appropriate location. -->
- <tagBase>https://svn.jboss.org/repos/common/common-logging-jdk/tags</tagBase>
- </configuration>
- </plugin>
- <plugin>
- <groupId>jboss.maven-plugins</groupId>
- <artifactId>jboss-deploy-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-retro-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <id>weave-classes</id>
- <goals>
- <goal>weave</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/classes-jdk14</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>weave-test-classes</id>
- <goals>
- <goal>weave-tests</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/test-classes-jdk14</outputDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <weaverClass>org.jboss.weaver.retro.WeaverRetroJdk14</weaverClass>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <classesDirectory>${project.build.directory}/classes-jdk14</classesDirectory>
- </configuration>
- </plugin>
- <plugin>
- <!-- Skip the tests here because the jdk14 tests have
- - to run the tests in a separate profile.
- -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-logging-spi-jdk14</artifactId>
- <version>2.0.5-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core-jdk14</artifactId>
- <version>2.2.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-backport-concurrent</artifactId>
- <version>2.1.0.GA</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-retro</artifactId>
- <version>1.1.2</version>
- <classifier>rt</classifier>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <!-- Note: to run the jdk14 tests, the surefire plugin must be called outside
- - of the lifecycle. In other words it should be called directly from the command
- - line like this
- - mvn -f pom-jdk14.xml -Prun-jdk14-tests surefire:test
- -->
- <profile>
- <id>run-jdk14-tests</id>
- <properties>
- <mainOutputDir>target/classes-jdk14</mainOutputDir>
- <testOutputDir>target/test-classes-jdk14</testOutputDir>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <id>enforce-jdk14-property</id>
- <goals>
- <goal>enforce-once</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>java14_home</property>
- <message>
- The property java14_home should be set to a valid installation of jdk1.4. The jdk14 tests cannot be run without this property.
- </message>
- </requireProperty>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <jvm>${java14_home}/bin/java</jvm>
- <forkMode>always</forkMode>
- <skip>false</skip>
- <reportsDirectory>${project.build.directory}/surefire-reports-jdk14</reportsDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <properties>
- <mainOutputDir>target/classes</mainOutputDir>
- <testOutputDir>target/test-classes</testOutputDir>
- </properties>
-
-</project>
Modified: common-logging-jdk/trunk/pom.xml
===================================================================
--- common-logging-jdk/trunk/pom.xml 2008-04-08 13:26:09 UTC (rev 2819)
+++ common-logging-jdk/trunk/pom.xml 2008-04-08 13:50:21 UTC (rev 2820)
@@ -6,12 +6,13 @@
<version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-common-logging-jdk</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-jdk</artifactId>
<version>2.0.5-SNAPSHOT</version>
<packaging>jar</packaging>
<name>JBoss Logging JDK</name>
<url>http://www.jboss.org</url>
- <description>JBoss Common Logging JDK Implementation</description>
+ <description>JBoss Logging JDK Implementation</description>
<scm>
<connection>scm:svn:https://svn.jboss.org/repos/common/common-logging-jdk/trunk/</connection>
</scm>
@@ -54,23 +55,25 @@
</snapshots>
</repository>
</repositories>
+
<dependencies>
+
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- <version>2.0.5-SNAPSHOT</version>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>2.0.5.GA</version>
</dependency>
+
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>2.2.5-SNAPSHOT</version>
- <optional>true</optional> <!-- For property editors used by DOMConfigurator -->
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.2.5.GA</version>
+ <!-- org.jboss.logging.jdk.xml DOMConfigurator uses:
+ import org.jboss.util.StringPropertyReplacer;
+ import org.jboss.util.propertyeditor.PropertyEditors;
+ import org.jboss.util.xml.JBossEntityResolver; -->
+ <optional>true</optional>
</dependency>
- </dependencies>
+ </dependencies>
+
</project>
Modified: common-logging-jdk/trunk/projectSet.psf
===================================================================
--- common-logging-jdk/trunk/projectSet.psf 2008-04-08 13:26:09 UTC (rev 2819)
+++ common-logging-jdk/trunk/projectSet.psf 2008-04-08 13:50:21 UTC (rev 2820)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<psf version="2.0">
<provider id="org.tigris.subversion.subclipse.core.svnnature">
- <project reference="0.9.3,https://svn.jboss.org/repos/common/trunk/common-logging-jdk/trunk,common-logging-jdk"/>
+ <project reference="0.9.3,https://svn.jboss.org/repos/common/trunk/common-logging-jdk/trunk,jboss-logging-jdk"/>
</provider>
</psf>
More information about the jboss-svn-commits
mailing list