[jboss-cvs] JBossAS SVN: r106781 - in projects/mc-tools/grapher/trunk: src/main/java/org/jboss/mctools/grapher/graph and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 16 08:43:48 EDT 2010
Author: alesj
Date: 2010-07-16 08:43:48 -0400 (Fri, 16 Jul 2010)
New Revision: 106781
Modified:
projects/mc-tools/grapher/trunk/pom.xml
projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DeploymentGraphCreator.java
Log:
Update MC libs.
Modified: projects/mc-tools/grapher/trunk/pom.xml
===================================================================
--- projects/mc-tools/grapher/trunk/pom.xml 2010-07-16 12:26:31 UTC (rev 106780)
+++ projects/mc-tools/grapher/trunk/pom.xml 2010-07-16 12:43:48 UTC (rev 106781)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.jboss.microcontainer.tools</groupId>
<artifactId>grapher</artifactId>
@@ -18,7 +18,15 @@
</scm>
<properties>
+ <version.jgraph>5.12.4</version.jgraph>
<version.batik>1.6</version.batik>
+ <version.servlet>2.1.2.GA</version.servlet>
+ <version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
+ <version.org.jboss.common>2.2.17.GA</version.org.jboss.common>
+ <version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
+ <version.org.jboss.kernel>2.2.0.Alpha10</version.org.jboss.kernel>
+ <version.org.jboss.deployers>2.2.0.Alpha6</version.org.jboss.deployers>
+ <version.org.jboss.mc-int>2.2.0.Alpha2</version.org.jboss.mc-int>
<version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
<version.junit>4.4</version.junit>
</properties>
@@ -43,38 +51,8 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <phase>validate</phase>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>2.0.9</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>1.5.0</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
- <configuration>
- <generateReleasePoms>false</generateReleasePoms>
- <tagBase>https://svn.jboss.org/repos/jbossas/projects/kernel/tags</tagBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
+ <version>2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -150,7 +128,7 @@
<dependency>
<groupId>org.jgraph</groupId>
<artifactId>jgraph</artifactId>
- <version>5.12.4</version>
+ <version>${version.jgraph}</version>
</dependency>
<!-- Uncomment this + place JGraphLayout in your local repo -->
<!--<dependency>-->
@@ -163,45 +141,45 @@
<dependency>
<groupId>jboss.web</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.1.2.GA</version>
+ <version>${version.servlet}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
- <version>2.2.16.GA</version>
+ <version>${version.org.jboss.common}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
- <version>2.1.0.GA</version>
+ <version>${version.org.jboss.logging}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- <version>2.1.3.SP1</version>
+ <version>${version.org.jboss.vfs}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.9.GA</version>
+ <version>${version.org.jboss.kernel}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
- <version>2.0.9.GA</version>
+ <version>${version.org.jboss.deployers}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.mc-int</groupId>
<artifactId>jboss-mc-int-servlet</artifactId>
- <version>2.2.0.Alpha2</version>
+ <version>${version.org.jboss.mc-int}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.deployers</groupId>
Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DeploymentGraphCreator.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DeploymentGraphCreator.java 2010-07-16 12:26:31 UTC (rev 106780)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/graph/DeploymentGraphCreator.java 2010-07-16 12:43:48 UTC (rev 106781)
@@ -32,8 +32,8 @@
import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.util.StringPropertyReplacer;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jgraph.graph.ConnectionSet;
import org.jgraph.graph.GraphCell;
@@ -98,7 +98,7 @@
String uriString = "${jboss.server.home.url}" + folder + "/" + deploymentName;
uriString = StringPropertyReplacer.replaceProperties(uriString);
URI uri = new URI(uriString);
- VirtualFile root = VFS.getRoot(uri);
+ VirtualFile root = VFS.getChild(uri);
return root.toURI().toString();
}
More information about the jboss-cvs-commits
mailing list