[jboss-cvs] JBossAS SVN: r100826 - in projects/metadata/ear/trunk: src/main/java/org/jboss/annotation/ear and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 10 17:28:35 EST 2010
Author: jason.greene at jboss.com
Date: 2010-02-10 17:28:33 -0500 (Wed, 10 Feb 2010)
New Revision: 100826
Modified:
projects/metadata/ear/trunk/pom.xml
projects/metadata/ear/trunk/src/main/java/org/jboss/annotation/ear/Ear.java
projects/metadata/ear/trunk/src/main/java/org/jboss/annotation/ear/Module.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/ServiceModuleMetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.java
projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java
projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/annotation/package-info.java
projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java
projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/EarTestSuite.java
projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java
projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/xml/EarXmlValidationUnitTestCase.java
projects/metadata/ear/trunk/src/test/resources/log4j.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testAppXmlOnly.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testJBossSecurityRoles.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testNoDtd.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion13.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion14.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testDescriptionGroup.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testId.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testVersion.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testModuleOrder.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion40.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion42.xml
projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.xml
Log:
Fix ws
Modified: projects/metadata/ear/trunk/pom.xml
===================================================================
--- projects/metadata/ear/trunk/pom.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/pom.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,125 +1,125 @@
-<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.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>4.0.CR1</version>
- </parent>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-ear</artifactId>
- <packaging>jar</packaging>
- <version>2.0.0-SNAPSHOT</version>
- <name>JBoss Metadata EAR</name>
- <url>http://www.jboss.org</url>
- <description>The common JavaEE metadata classes</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/ear/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/ear/trunk/</developerConnection>
- </scm>
-
- <build>
- <outputDirectory>${profile.outputDirectory}</outputDirectory>
- <testOutputDirectory>${profile.testOutputDirectory}</testOutputDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </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>
-
- <!--
- Eclipse settings have been removed from parent. This needs to be
- done via an eclipse profile.
- http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4085896#4085896
- -->
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <profile.outputDirectory>target/classes</profile.outputDirectory>
- <profile.testOutputDirectory>target/tests-classes</profile.testOutputDirectory>
- </properties>
- </profile>
-
- <profile>
- <id>eclipse</id>
- <properties>
- <profile.outputDirectory>eclipse-target/classes</profile.outputDirectory>
- <profile.testOutputDirectory>eclipse-target/tests-classes</profile.testOutputDirectory>
- </properties>
- </profile>
- </profiles>
-
- <!-- Compile Dependencies -->
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-common</artifactId>
- <version>2.0.0-alpha-10</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-common</artifactId>
- <version>2.0.0-alpha-10</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <!-- Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test</groupId>
- <artifactId>jboss-test</artifactId>
- <version>1.1.4.GA</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</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.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4.0.CR1</version>
+ </parent>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ear</artifactId>
+ <packaging>jar</packaging>
+ <version>2.0.0-SNAPSHOT</version>
+ <name>JBoss Metadata EAR</name>
+ <url>http://www.jboss.org</url>
+ <description>The common JavaEE metadata classes</description>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/ear/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/ear/trunk/</developerConnection>
+ </scm>
+
+ <build>
+ <outputDirectory>${profile.outputDirectory}</outputDirectory>
+ <testOutputDirectory>${profile.testOutputDirectory}</testOutputDirectory>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <printSummary>true</printSummary>
+ <disableXmlReport>false</disableXmlReport>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ </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>
+
+ <!--
+ Eclipse settings have been removed from parent. This needs to be
+ done via an eclipse profile.
+ http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4085896#4085896
+ -->
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <profile.outputDirectory>target/classes</profile.outputDirectory>
+ <profile.testOutputDirectory>target/tests-classes</profile.testOutputDirectory>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>eclipse</id>
+ <properties>
+ <profile.outputDirectory>eclipse-target/classes</profile.outputDirectory>
+ <profile.testOutputDirectory>eclipse-target/tests-classes</profile.testOutputDirectory>
+ </properties>
+ </profile>
+ </profiles>
+
+ <!-- Compile Dependencies -->
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-common</artifactId>
+ <version>2.0.0-alpha-10</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-common</artifactId>
+ <version>2.0.0-alpha-10</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.1.4.GA</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Property changes on: projects/metadata/ear/trunk/pom.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/annotation/ear/Ear.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/annotation/ear/Ear.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/annotation/ear/Ear.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,34 +1,34 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.annotation.ear;
-
-/**
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 66759 $
- */
-public @interface Ear
-{
- String description() default "";
- Module[] modules();
- String libraryDirectory() default "";
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.annotation.ear;
+
+/**
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 66759 $
+ */
+public @interface Ear
+{
+ String description() default "";
+ Module[] modules();
+ String libraryDirectory() default "";
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/annotation/ear/Ear.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/annotation/ear/Module.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/annotation/ear/Module.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/annotation/ear/Module.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,38 +1,38 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.annotation.ear;
-
-import org.jboss.metadata.ear.spec.ModuleMetaData.ModuleType;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision: 66759 $
- */
-public @interface Module
-{
- /** The module archive file */
- String fileName();
- /** The optional module id */
- String id() default "";
- /** The type of module */
- ModuleType type();
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.annotation.ear;
+
+import org.jboss.metadata.ear.spec.ModuleMetaData.ModuleType;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 66759 $
+ */
+public @interface Module
+{
+ /** The module archive file */
+ String fileName();
+ /** The optional module id */
+ String id() default "";
+ /** The type of module */
+ ModuleType type();
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/annotation/ear/Module.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,62 +1,62 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.jboss;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision: 81860 $
- */
- at XmlRootElement(name="jboss-app", namespace=JavaEEMetaDataConstants.JBOSS_NS)
- at JBossXmlSchema(
- xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
- ignoreUnresolvedFieldOrClass=false,
- namespace=JavaEEMetaDataConstants.JBOSS_NS,
- elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlType(name="jboss-appType",
- namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"moduleOrder", "securityDomain", "unauthenticatedPrincipal", "loaderRepository", "jmxName",
- "libraryDirectory", "modules", "securityRoles"})
-public class JBoss50AppMetaData extends JBossAppMetaData
-{
- private static final long serialVersionUID = 1;
-
- /**
- * Override to map the jboss-app version attribute onto the version property
- */
- @Override
- @XmlAttribute(name="version")
- public void setVersion(String version)
- {
- // TODO Auto-generated method stub
- super.setVersion(version);
- }
-
-
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.jboss;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 81860 $
+ */
+ at XmlRootElement(name="jboss-app", namespace=JavaEEMetaDataConstants.JBOSS_NS)
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace=JavaEEMetaDataConstants.JBOSS_NS,
+ elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlType(name="jboss-appType",
+ namespace=JavaEEMetaDataConstants.JBOSS_NS, propOrder={"moduleOrder", "securityDomain", "unauthenticatedPrincipal", "loaderRepository", "jmxName",
+ "libraryDirectory", "modules", "securityRoles"})
+public class JBoss50AppMetaData extends JBossAppMetaData
+{
+ private static final long serialVersionUID = 1;
+
+ /**
+ * Override to map the jboss-app version attribute onto the version property
+ */
+ @Override
+ @XmlAttribute(name="version")
+ public void setVersion(String version)
+ {
+ // TODO Auto-generated method stub
+ super.setVersion(version);
+ }
+
+
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50AppMetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,51 +1,51 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.jboss;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * jboss-app metadata without a namespace
- * @author Scott.Stark at jboss.org
- * @version $Revision: 81860 $
- */
- at XmlRootElement(name="jboss-app", namespace="")
- at JBossXmlSchema(
- xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
- ignoreUnresolvedFieldOrClass=false,
- namespace="",
- elementFormDefault=XmlNsForm.UNSET)
- at XmlType(name="jboss-appType",
- namespace="",
- propOrder={"moduleOrder", "securityDomain", "unauthenticatedPrincipal", "loaderRepository", "jmxName", "libraryDirectory", "modules",
- "securityRoles"})
-public class JBoss50DTDAppMetaData extends JBossAppMetaData
-{
- private static final long serialVersionUID = 1;
-
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.jboss;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * jboss-app metadata without a namespace
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 81860 $
+ */
+ at XmlRootElement(name="jboss-app", namespace="")
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace="",
+ elementFormDefault=XmlNsForm.UNSET)
+ at XmlType(name="jboss-appType",
+ namespace="",
+ propOrder={"moduleOrder", "securityDomain", "unauthenticatedPrincipal", "loaderRepository", "jmxName", "libraryDirectory", "modules",
+ "securityRoles"})
+public class JBoss50DTDAppMetaData extends JBossAppMetaData
+{
+ private static final long serialVersionUID = 1;
+
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/JBoss50DTDAppMetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/ServiceModuleMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/ServiceModuleMetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/ServiceModuleMetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,46 +1,46 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.jboss;
-
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.ear.spec.AbstractModule;
-
-/**
- * A service mbean module
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 65911 $
- */
- at XmlType(name="serviceType")
-public class ServiceModuleMetaData extends AbstractModule
-{
- private static final long serialVersionUID = 1;
-
- @XmlTransient
- public String getSar()
- {
- return getFileName();
- }
-
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.jboss;
+
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.ear.spec.AbstractModule;
+
+/**
+ * A service mbean module
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 65911 $
+ */
+ at XmlType(name="serviceType")
+public class ServiceModuleMetaData extends AbstractModule
+{
+ private static final long serialVersionUID = 1;
+
+ @XmlTransient
+ public String getSar()
+ {
+ return getFileName();
+ }
+
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/jboss/ServiceModuleMetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,59 +1,59 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlValue;
-
-import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
-import org.jboss.metadata.javaee.support.IdMetaDataImpl;
-import org.jboss.xb.annotations.JBossXmlConstants;
-import org.jboss.xb.annotations.JBossXmlModelGroup;
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision:$
- */
- at JBossXmlModelGroup(
- kind=JBossXmlConstants.MODEL_GROUP_CHOICE,
- particles={
- @JBossXmlModelGroup.Particle(element=@XmlElement(name="connector"), type=ConnectorModuleMetaData.class),
- @JBossXmlModelGroup.Particle(element=@XmlElement(name="ejb"), type=EjbModuleMetaData.class),
- @JBossXmlModelGroup.Particle(element=@XmlElement(name="java"), type=JavaModuleMetaData.class),
- @JBossXmlModelGroup.Particle(element=@XmlElement(name="web"), type=WebModuleMetaData.class),
- @JBossXmlModelGroup.Particle(element=@XmlElement(name="service"), type=ServiceModuleMetaData.class),
- @JBossXmlModelGroup.Particle(element=@XmlElement(name="har"), type=ServiceModuleMetaData.class)})
-public class AbstractModule extends IdMetaDataImpl
-{
- private static final long serialVersionUID = 1;
- private String fileName;
-
- public String getFileName()
- {
- return fileName;
- }
- @XmlValue
- public void setFileName(String fileName)
- {
- this.fileName = fileName;
- }
-
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlValue;
+
+import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlModelGroup;
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+ at JBossXmlModelGroup(
+ kind=JBossXmlConstants.MODEL_GROUP_CHOICE,
+ particles={
+ @JBossXmlModelGroup.Particle(element=@XmlElement(name="connector"), type=ConnectorModuleMetaData.class),
+ @JBossXmlModelGroup.Particle(element=@XmlElement(name="ejb"), type=EjbModuleMetaData.class),
+ @JBossXmlModelGroup.Particle(element=@XmlElement(name="java"), type=JavaModuleMetaData.class),
+ @JBossXmlModelGroup.Particle(element=@XmlElement(name="web"), type=WebModuleMetaData.class),
+ @JBossXmlModelGroup.Particle(element=@XmlElement(name="service"), type=ServiceModuleMetaData.class),
+ @JBossXmlModelGroup.Particle(element=@XmlElement(name="har"), type=ServiceModuleMetaData.class)})
+public class AbstractModule extends IdMetaDataImpl
+{
+ private static final long serialVersionUID = 1;
+ private String fileName;
+
+ public String getFileName()
+ {
+ return fileName;
+ }
+ @XmlValue
+ public void setFileName(String fileName)
+ {
+ this.fileName = fileName;
+ }
+
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/AbstractModule.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,42 +1,42 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision: 65911 $
- */
- at XmlType(name="connectorType")
-public class ConnectorModuleMetaData extends AbstractModule
-{
- private static final long serialVersionUID = 1;
-
- @XmlTransient
- public String getConnector()
- {
- return getFileName();
- }
-
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 65911 $
+ */
+ at XmlType(name="connectorType")
+public class ConnectorModuleMetaData extends AbstractModule
+{
+ private static final long serialVersionUID = 1;
+
+ @XmlTransient
+ public String getConnector()
+ {
+ return getFileName();
+ }
+
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ConnectorModuleMetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,100 +1,100 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
-import org.jboss.metadata.javaee.spec.DescriptionsImpl;
-import org.jboss.metadata.javaee.spec.DisplayNameImpl;
-import org.jboss.metadata.javaee.spec.DisplayNamesImpl;
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * j2ee 1.3 and earlier ear metadata with no namespace
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 81860 $
- */
- at XmlRootElement(name="application", namespace="")
- at JBossXmlSchema(
- xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
- ignoreUnresolvedFieldOrClass=false,
- namespace="",
- elementFormDefault=XmlNsForm.UNSET,
- normalizeSpace=true)
- at XmlType(name="applicationType",
- namespace="", propOrder={"descriptionGroup", "modules", "securityRoles"})
-public class Ear13DTDMetaData extends EarMetaData
-{
- private static final long serialVersionUID = 1;
-
- public String getDisplayName()
- {
- String name = null;
- DescriptionGroupMetaData group = getDescriptionGroup();
- if (group != null)
- {
- name = group.getDisplayName();
- }
- return name;
- }
- public void setDisplayName(String name)
- {
- DescriptionGroupMetaData group = getDescriptionGroup();
- if(group == null)
- group = new DescriptionGroupMetaData();
- DisplayNameImpl dn = new DisplayNameImpl();
- dn.setDisplayName(name);
- DisplayNamesImpl names = new DisplayNamesImpl();
- names.add(dn);
- group.setDisplayNames(names);
- setDescriptionGroup(group);
- }
-
- public String getDescription()
- {
- String desc = null;
- DescriptionGroupMetaData group = getDescriptionGroup();
- if (group != null)
- {
- desc = group.getDescription();
- }
- return desc;
- }
- public void setDescription(String desc)
- {
- DescriptionGroupMetaData group = getDescriptionGroup();
- if(group == null)
- group = new DescriptionGroupMetaData();
- DescriptionsImpl descriptions = new DescriptionsImpl();
- DescriptionImpl di = new DescriptionImpl();
- di.setDescription(desc);
- descriptions.add(di);
- group.setDescriptions(descriptions);
- }
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.spec.DescriptionsImpl;
+import org.jboss.metadata.javaee.spec.DisplayNameImpl;
+import org.jboss.metadata.javaee.spec.DisplayNamesImpl;
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * j2ee 1.3 and earlier ear metadata with no namespace
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 81860 $
+ */
+ at XmlRootElement(name="application", namespace="")
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace="",
+ elementFormDefault=XmlNsForm.UNSET,
+ normalizeSpace=true)
+ at XmlType(name="applicationType",
+ namespace="", propOrder={"descriptionGroup", "modules", "securityRoles"})
+public class Ear13DTDMetaData extends EarMetaData
+{
+ private static final long serialVersionUID = 1;
+
+ public String getDisplayName()
+ {
+ String name = null;
+ DescriptionGroupMetaData group = getDescriptionGroup();
+ if (group != null)
+ {
+ name = group.getDisplayName();
+ }
+ return name;
+ }
+ public void setDisplayName(String name)
+ {
+ DescriptionGroupMetaData group = getDescriptionGroup();
+ if(group == null)
+ group = new DescriptionGroupMetaData();
+ DisplayNameImpl dn = new DisplayNameImpl();
+ dn.setDisplayName(name);
+ DisplayNamesImpl names = new DisplayNamesImpl();
+ names.add(dn);
+ group.setDisplayNames(names);
+ setDescriptionGroup(group);
+ }
+
+ public String getDescription()
+ {
+ String desc = null;
+ DescriptionGroupMetaData group = getDescriptionGroup();
+ if (group != null)
+ {
+ desc = group.getDescription();
+ }
+ return desc;
+ }
+ public void setDescription(String desc)
+ {
+ DescriptionGroupMetaData group = getDescriptionGroup();
+ if(group == null)
+ group = new DescriptionGroupMetaData();
+ DescriptionsImpl descriptions = new DescriptionsImpl();
+ DescriptionImpl di = new DescriptionImpl();
+ di.setDescription(desc);
+ descriptions.add(di);
+ group.setDescriptions(descriptions);
+ }
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear13DTDMetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,57 +1,57 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * j2ee 1.4 ear metadata
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 81860 $
- */
- at XmlRootElement(name="application", namespace=JavaEEMetaDataConstants.J2EE_NS)
- at JBossXmlSchema(
- xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
- ignoreUnresolvedFieldOrClass=false,
- namespace=JavaEEMetaDataConstants.J2EE_NS,
- elementFormDefault=XmlNsForm.QUALIFIED,
- normalizeSpace=true)
- at XmlType(name="applicationType",
- namespace=JavaEEMetaDataConstants.J2EE_NS, propOrder={"descriptionGroup", "modules", "securityRoles"})
-public class Ear14MetaData extends EarMetaData
-{
- private static final long serialVersionUID = 1;
-
- @Override
- public boolean isEE14()
- {
- return true;
- }
-
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * j2ee 1.4 ear metadata
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 81860 $
+ */
+ at XmlRootElement(name="application", namespace=JavaEEMetaDataConstants.J2EE_NS)
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.J2EE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace=JavaEEMetaDataConstants.J2EE_NS,
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
+ at XmlType(name="applicationType",
+ namespace=JavaEEMetaDataConstants.J2EE_NS, propOrder={"descriptionGroup", "modules", "securityRoles"})
+public class Ear14MetaData extends EarMetaData
+{
+ private static final long serialVersionUID = 1;
+
+ @Override
+ public boolean isEE14()
+ {
+ return true;
+ }
+
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear14MetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,50 +1,50 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision: 76701 $
- */
- at XmlRootElement(name="application", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
- at JBossXmlSchema(
- xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
- ignoreUnresolvedFieldOrClass=false,
- namespace=JavaEEMetaDataConstants.JAVAEE_NS,
- elementFormDefault=XmlNsForm.QUALIFIED,
- normalizeSpace=true)
- at XmlType(name="applicationType",
- namespace=JavaEEMetaDataConstants.JAVAEE_NS,
- propOrder={"descriptionGroup", "modules", "securityRoles", "libraryDirectory"})
-public class Ear50MetaData extends Ear5xMetaData
-{
- private static final long serialVersionUID = 1;
-
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 76701 $
+ */
+ at XmlRootElement(name="application", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
+ at JBossXmlSchema(
+ xmlns={@XmlNs(namespaceURI = JavaEEMetaDataConstants.JAVAEE_NS, prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
+ namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
+ at XmlType(name="applicationType",
+ namespace=JavaEEMetaDataConstants.JAVAEE_NS,
+ propOrder={"descriptionGroup", "modules", "securityRoles", "libraryDirectory"})
+public class Ear50MetaData extends Ear5xMetaData
+{
+ private static final long serialVersionUID = 1;
+
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear50MetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,52 +1,52 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
-
-/**
- * javaee 5.x ear metadata
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 65904 $
- */
-public class Ear5xMetaData extends EarMetaData
-{
- private static final long serialVersionUID = 1;
-
- private String libraryDirectory;
-
- @Override
- public boolean isEE5()
- {
- return true;
- }
-
- public String getLibraryDirectory()
- {
- return libraryDirectory;
- }
-
- public void setLibraryDirectory(String libraryDirectory)
- {
- this.libraryDirectory = libraryDirectory;
- }
-
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
+
+/**
+ * javaee 5.x ear metadata
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 65904 $
+ */
+public class Ear5xMetaData extends EarMetaData
+{
+ private static final long serialVersionUID = 1;
+
+ private String libraryDirectory;
+
+ @Override
+ public boolean isEE5()
+ {
+ return true;
+ }
+
+ public String getLibraryDirectory()
+ {
+ return libraryDirectory;
+ }
+
+ public void setLibraryDirectory(String libraryDirectory)
+ {
+ this.libraryDirectory = libraryDirectory;
+ }
+
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/Ear5xMetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,171 +1,171 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
-import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-
-/**
- * Common javaee application metadata
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 75470 $
- */
-public class EarMetaData extends IdMetaDataImplWithDescriptionGroup
-{
- private static final long serialVersionUID = 1;
- private String dtdPublicId;
- private String dtdSystemId;
- private String version;
- /** The application modules */
- private ModulesMetaData modules;
- /** The security roles */
- private SecurityRolesMetaData securityRoles;
-
- /**
- * Callback for the DTD information
- * @param root
- * @param publicId
- * @param systemId
- */
- @XmlTransient
- public void setDTD(String root, String publicId, String systemId)
- {
- this.dtdPublicId = publicId;
- this.dtdSystemId = systemId;
- // Set the version based on
- if (dtdPublicId != null && dtdPublicId.contains("1.3"))
- setVersion("1.3");
- else if (dtdSystemId != null && dtdSystemId.contains("1.3"))
- setVersion("1.3");
- else if (dtdSystemId != null && dtdSystemId.contains("1.2"))
- setVersion("1.2");
- }
- /**
- * Get the DTD public id if one was seen
- * @return the value of the web.xml dtd public id
- */
- @XmlTransient
- public String getDtdPublicId()
- {
- return dtdPublicId;
- }
- /**
- * Get the DTD system id if one was seen
- * @return the value of the web.xml dtd system id
- */
- @XmlTransient
- public String getDtdSystemId()
- {
- return dtdSystemId;
- }
-
- /**
- * Is this a javaee 5 version application
- * @return true if this is a javaee 5 version application
- */
- public boolean isEE5()
- {
- return false;
- }
- /**
- * Is this a javaee 1.4 version application
- * @return true if this is a javaee 1.4 version application
- */
- public boolean isEE14()
- {
- return false;
- }
- /**
- * Is this a javaee 1.3 version application
- * @return true if this is a javaee 1.3 version application
- */
- public boolean isEE13()
- {
- return dtdPublicId != null && dtdPublicId.equals(JavaEEMetaDataConstants.J2EE_13_APP);
- }
-
- /**
- * Get the version.
- *
- * @return the version.
- */
- public String getVersion()
- {
- return version;
- }
-
- /**
- * Set the version.
- *
- * @param version the version.
- * @throws IllegalArgumentException for a null version
- */
- @XmlAttribute
- public void setVersion(String version)
- {
- if (version == null)
- throw new IllegalArgumentException("Null version");
- this.version = version;
- }
-
-
- /**
- * Get the application module information
- * @return the list of application modules
- */
- public ModulesMetaData getModules()
- {
- return modules;
- }
- /**
- * Set the application module information
- * @param module - the list of application modules
- */
- @XmlElement(name="module")
- public void setModules(ModulesMetaData modules)
- {
- this.modules = modules;
- }
- /**
- * Get the security roles
- * @return securityRoles
- */
- public SecurityRolesMetaData getSecurityRoles()
- {
- return securityRoles;
- }
- /**
- * Set the security roles
- * @param securityRoles
- */
- @XmlElement(name="security-role")
- public void setSecurityRoles(SecurityRolesMetaData securityRoles)
- {
- this.securityRoles = securityRoles;
- }
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
+
+/**
+ * Common javaee application metadata
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 75470 $
+ */
+public class EarMetaData extends IdMetaDataImplWithDescriptionGroup
+{
+ private static final long serialVersionUID = 1;
+ private String dtdPublicId;
+ private String dtdSystemId;
+ private String version;
+ /** The application modules */
+ private ModulesMetaData modules;
+ /** The security roles */
+ private SecurityRolesMetaData securityRoles;
+
+ /**
+ * Callback for the DTD information
+ * @param root
+ * @param publicId
+ * @param systemId
+ */
+ @XmlTransient
+ public void setDTD(String root, String publicId, String systemId)
+ {
+ this.dtdPublicId = publicId;
+ this.dtdSystemId = systemId;
+ // Set the version based on
+ if (dtdPublicId != null && dtdPublicId.contains("1.3"))
+ setVersion("1.3");
+ else if (dtdSystemId != null && dtdSystemId.contains("1.3"))
+ setVersion("1.3");
+ else if (dtdSystemId != null && dtdSystemId.contains("1.2"))
+ setVersion("1.2");
+ }
+ /**
+ * Get the DTD public id if one was seen
+ * @return the value of the web.xml dtd public id
+ */
+ @XmlTransient
+ public String getDtdPublicId()
+ {
+ return dtdPublicId;
+ }
+ /**
+ * Get the DTD system id if one was seen
+ * @return the value of the web.xml dtd system id
+ */
+ @XmlTransient
+ public String getDtdSystemId()
+ {
+ return dtdSystemId;
+ }
+
+ /**
+ * Is this a javaee 5 version application
+ * @return true if this is a javaee 5 version application
+ */
+ public boolean isEE5()
+ {
+ return false;
+ }
+ /**
+ * Is this a javaee 1.4 version application
+ * @return true if this is a javaee 1.4 version application
+ */
+ public boolean isEE14()
+ {
+ return false;
+ }
+ /**
+ * Is this a javaee 1.3 version application
+ * @return true if this is a javaee 1.3 version application
+ */
+ public boolean isEE13()
+ {
+ return dtdPublicId != null && dtdPublicId.equals(JavaEEMetaDataConstants.J2EE_13_APP);
+ }
+
+ /**
+ * Get the version.
+ *
+ * @return the version.
+ */
+ public String getVersion()
+ {
+ return version;
+ }
+
+ /**
+ * Set the version.
+ *
+ * @param version the version.
+ * @throws IllegalArgumentException for a null version
+ */
+ @XmlAttribute
+ public void setVersion(String version)
+ {
+ if (version == null)
+ throw new IllegalArgumentException("Null version");
+ this.version = version;
+ }
+
+
+ /**
+ * Get the application module information
+ * @return the list of application modules
+ */
+ public ModulesMetaData getModules()
+ {
+ return modules;
+ }
+ /**
+ * Set the application module information
+ * @param module - the list of application modules
+ */
+ @XmlElement(name="module")
+ public void setModules(ModulesMetaData modules)
+ {
+ this.modules = modules;
+ }
+ /**
+ * Get the security roles
+ * @return securityRoles
+ */
+ public SecurityRolesMetaData getSecurityRoles()
+ {
+ return securityRoles;
+ }
+ /**
+ * Set the security roles
+ * @param securityRoles
+ */
+ @XmlElement(name="security-role")
+ public void setSecurityRoles(SecurityRolesMetaData securityRoles)
+ {
+ this.securityRoles = securityRoles;
+ }
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/EarMetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,41 +1,41 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision: 65911 $
- */
- at XmlType(name="ejbType")
-public class EjbModuleMetaData extends AbstractModule
-{
- private static final long serialVersionUID = 1;
-
- @XmlTransient
- public String getEjbJar()
- {
- return getFileName();
- }
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 65911 $
+ */
+ at XmlType(name="ejbType")
+public class EjbModuleMetaData extends AbstractModule
+{
+ private static final long serialVersionUID = 1;
+
+ @XmlTransient
+ public String getEjbJar()
+ {
+ return getFileName();
+ }
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/EjbModuleMetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,44 +1,44 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision: 75470 $
- */
- at XmlType(name="javaType")
-public class JavaModuleMetaData extends AbstractModule
-{
- private static final long serialVersionUID = 1;
- private String clientJar;
-
- @XmlTransient
- public String getClientJar()
- {
- return getFileName();
- }
-
-
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 75470 $
+ */
+ at XmlType(name="javaType")
+public class JavaModuleMetaData extends AbstractModule
+{
+ private static final long serialVersionUID = 1;
+ private String clientJar;
+
+ @XmlTransient
+ public String getClientJar()
+ {
+ return getFileName();
+ }
+
+
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/JavaModuleMetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,104 +1,104 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlTransient;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
-import org.jboss.metadata.javaee.support.NamedMetaData;
-import org.jboss.xb.annotations.JBossXmlChild;
-import org.jboss.xb.annotations.JBossXmlChildren;
-
-/**
- * Application module metadata
- * @author Scott.Stark at jboss.org
- * @version $Revision: 84989 $
- */
- at XmlType(name="moduleType", propOrder={"value", "alternativeDD"})
-/*@JBossXmlChildren
-({
- @JBossXmlChild(name="connector", type=ConnectorModuleMetaData.class),
- @JBossXmlChild(name="ejb", type=EjbModuleMetaData.class),
- @JBossXmlChild(name="java", type=JavaModuleMetaData.class),
- @JBossXmlChild(name="web", type=WebModuleMetaData.class),
- @JBossXmlChild(name="service", type=ServiceModuleMetaData.class),
- @JBossXmlChild(name="har", type=ServiceModuleMetaData.class)
-})
-*/public class ModuleMetaData extends NamedMetaData
-{
- private static final long serialVersionUID = 1;
- private AbstractModule module;
- private String altDD;
-
- public enum ModuleType {Connector, Client, Ejb, Service, Web};
-
- public AbstractModule getValue()
- {
- return module;
- }
-
- public void setValue(AbstractModule value)
- {
- this.module = value;
- // Set the mappable name to the module file name
- super.setName(value.getFileName());
- }
-
- public String getAlternativeDD()
- {
- return altDD;
- }
-
- @XmlElement(name="alt-dd")
- public void setAlternativeDD(String altDD)
- {
- this.altDD = altDD;
- }
-
- @XmlTransient
- public String getFileName()
- {
- String fileName = null;
- if (module != null)
- fileName = module.getFileName();
- return fileName;
- }
- @XmlTransient
- public ModuleType getType()
- {
- ModuleType type = ModuleType.Client;
- if (module instanceof EjbModuleMetaData)
- type = ModuleType.Ejb;
- else if(module instanceof ConnectorModuleMetaData)
- type = ModuleType.Connector;
- else if(module instanceof JavaModuleMetaData)
- type = ModuleType.Client;
- else if(module instanceof WebModuleMetaData)
- type = ModuleType.Web;
- else if(module instanceof ServiceModuleMetaData)
- type = ModuleType.Service;
- return type;
- }
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
+import org.jboss.metadata.javaee.support.NamedMetaData;
+import org.jboss.xb.annotations.JBossXmlChild;
+import org.jboss.xb.annotations.JBossXmlChildren;
+
+/**
+ * Application module metadata
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 84989 $
+ */
+ at XmlType(name="moduleType", propOrder={"value", "alternativeDD"})
+/*@JBossXmlChildren
+({
+ @JBossXmlChild(name="connector", type=ConnectorModuleMetaData.class),
+ @JBossXmlChild(name="ejb", type=EjbModuleMetaData.class),
+ @JBossXmlChild(name="java", type=JavaModuleMetaData.class),
+ @JBossXmlChild(name="web", type=WebModuleMetaData.class),
+ @JBossXmlChild(name="service", type=ServiceModuleMetaData.class),
+ @JBossXmlChild(name="har", type=ServiceModuleMetaData.class)
+})
+*/public class ModuleMetaData extends NamedMetaData
+{
+ private static final long serialVersionUID = 1;
+ private AbstractModule module;
+ private String altDD;
+
+ public enum ModuleType {Connector, Client, Ejb, Service, Web};
+
+ public AbstractModule getValue()
+ {
+ return module;
+ }
+
+ public void setValue(AbstractModule value)
+ {
+ this.module = value;
+ // Set the mappable name to the module file name
+ super.setName(value.getFileName());
+ }
+
+ public String getAlternativeDD()
+ {
+ return altDD;
+ }
+
+ @XmlElement(name="alt-dd")
+ public void setAlternativeDD(String altDD)
+ {
+ this.altDD = altDD;
+ }
+
+ @XmlTransient
+ public String getFileName()
+ {
+ String fileName = null;
+ if (module != null)
+ fileName = module.getFileName();
+ return fileName;
+ }
+ @XmlTransient
+ public ModuleType getType()
+ {
+ ModuleType type = ModuleType.Client;
+ if (module instanceof EjbModuleMetaData)
+ type = ModuleType.Ejb;
+ else if(module instanceof ConnectorModuleMetaData)
+ type = ModuleType.Connector;
+ else if(module instanceof JavaModuleMetaData)
+ type = ModuleType.Client;
+ else if(module instanceof WebModuleMetaData)
+ type = ModuleType.Web;
+ else if(module instanceof ServiceModuleMetaData)
+ type = ModuleType.Service;
+ return type;
+ }
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ModuleMetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,93 +1,93 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
-
-import java.util.Iterator;
-
-import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision: 66411 $
- */
-public class ModulesMetaData extends AbstractMappedMetaData<ModuleMetaData>
-{
- private static final long serialVersionUID = 1;
- public ModulesMetaData()
- {
- super("fileName");
- }
-
- /**
- * Convience method for treating the map as an ordered list. O(n), so not
- * efficient for large maps.
- *
- * @param index
- * @return
- */
- public ModuleMetaData get(int index)
- {
- if(index >= size())
- throw new IndexOutOfBoundsException(index+" >= "+size());
- Iterator<ModuleMetaData> iterator = super.iterator();
- ModuleMetaData module = null;
- for(int n = 0; n <= index; n ++)
- module = iterator.next();
- return module;
- }
-
- /**
- * Merge original + override into this.
- *
- * @param original
- * @param override
- */
- public void merge(ModulesMetaData override, ModulesMetaData original)
- {
- if(original == null)
- {
- if(override != null)
- this.addAll(override);
- }
- else if(override == null)
- {
- this.addAll(original);
- }
- else
- {
- for(ModuleMetaData module : original)
- {
- // Only include modules not override in the override map
- if(override.get(module.getFileName()) == null)
- this.add(module);
- else
- this.add(override.get(module.getFileName()));
- }
- // Add any modules from override not already added
- for(ModuleMetaData module : override)
- {
- if(this.get(module.getFileName()) == null)
- this.add(module);
- }
- }
- }
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
+
+import java.util.Iterator;
+
+import org.jboss.metadata.javaee.support.AbstractMappedMetaData;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 66411 $
+ */
+public class ModulesMetaData extends AbstractMappedMetaData<ModuleMetaData>
+{
+ private static final long serialVersionUID = 1;
+ public ModulesMetaData()
+ {
+ super("fileName");
+ }
+
+ /**
+ * Convience method for treating the map as an ordered list. O(n), so not
+ * efficient for large maps.
+ *
+ * @param index
+ * @return
+ */
+ public ModuleMetaData get(int index)
+ {
+ if(index >= size())
+ throw new IndexOutOfBoundsException(index+" >= "+size());
+ Iterator<ModuleMetaData> iterator = super.iterator();
+ ModuleMetaData module = null;
+ for(int n = 0; n <= index; n ++)
+ module = iterator.next();
+ return module;
+ }
+
+ /**
+ * Merge original + override into this.
+ *
+ * @param original
+ * @param override
+ */
+ public void merge(ModulesMetaData override, ModulesMetaData original)
+ {
+ if(original == null)
+ {
+ if(override != null)
+ this.addAll(override);
+ }
+ else if(override == null)
+ {
+ this.addAll(original);
+ }
+ else
+ {
+ for(ModuleMetaData module : original)
+ {
+ // Only include modules not override in the override map
+ if(override.get(module.getFileName()) == null)
+ this.add(module);
+ else
+ this.add(override.get(module.getFileName()));
+ }
+ // Add any modules from override not already added
+ for(ModuleMetaData module : override)
+ {
+ if(this.get(module.getFileName()) == null)
+ this.add(module);
+ }
+ }
+ }
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/ModulesMetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java
===================================================================
--- projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,57 +1,57 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision: 81860 $
- */
- at XmlType(name="webType", propOrder={"webURI", "contextRoot"})
-public class WebModuleMetaData extends AbstractModule
-{
- private static final long serialVersionUID = 1;
- private String webURI;
- private String contextRoot;
-
- public String getWebURI()
- {
- return webURI;
- }
- @XmlElement(name="web-uri")
- public void setWebURI(String webURI)
- {
- this.webURI = webURI;
- super.setFileName(webURI);
- }
- public String getContextRoot()
- {
- return contextRoot;
- }
- public void setContextRoot(String contextRoot)
- {
- this.contextRoot = contextRoot;
- }
-
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.metadata.ear.spec;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 81860 $
+ */
+ at XmlType(name="webType", propOrder={"webURI", "contextRoot"})
+public class WebModuleMetaData extends AbstractModule
+{
+ private static final long serialVersionUID = 1;
+ private String webURI;
+ private String contextRoot;
+
+ public String getWebURI()
+ {
+ return webURI;
+ }
+ @XmlElement(name="web-uri")
+ public void setWebURI(String webURI)
+ {
+ this.webURI = webURI;
+ super.setFileName(webURI);
+ }
+ public String getContextRoot()
+ {
+ return contextRoot;
+ }
+ public void setContextRoot(String contextRoot)
+ {
+ this.contextRoot = contextRoot;
+ }
+
+}
Property changes on: projects/metadata/ear/trunk/src/main/java/org/jboss/metadata/ear/spec/WebModuleMetaData.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/annotation/package-info.java
===================================================================
--- projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/annotation/package-info.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/annotation/package-info.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,35 +1,35 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt 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.
- */
- at Ear(description="An annotated ear",
- modules={
- @Module(id="connector0", fileName="rar0.rar", type=ModuleType.Connector),
- @Module(id="ejb0", fileName="ejb0.jar", type=ModuleType.Ejb),
- @Module(id="java0", fileName="client0.jar", type=ModuleType.Client),
- @Module(id="web0", fileName="web0.war", type=ModuleType.Web),
- @Module(id="sar0", fileName="sar0.rar", type=ModuleType.Service)
- }
-)
-package org.jboss.test.metadata.annotation;
-
-import org.jboss.annotation.ear.Ear;
-import org.jboss.annotation.ear.Module;
-import org.jboss.metadata.ear.spec.ModuleMetaData.ModuleType;
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.
+ */
+ at Ear(description="An annotated ear",
+ modules={
+ @Module(id="connector0", fileName="rar0.rar", type=ModuleType.Connector),
+ @Module(id="ejb0", fileName="ejb0.jar", type=ModuleType.Ejb),
+ @Module(id="java0", fileName="client0.jar", type=ModuleType.Client),
+ @Module(id="web0", fileName="web0.war", type=ModuleType.Web),
+ @Module(id="sar0", fileName="sar0.rar", type=ModuleType.Service)
+ }
+)
+package org.jboss.test.metadata.annotation;
+
+import org.jboss.annotation.ear.Ear;
+import org.jboss.annotation.ear.Module;
+import org.jboss.metadata.ear.spec.ModuleMetaData.ModuleType;
Property changes on: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/annotation/package-info.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
===================================================================
--- projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,274 +1,274 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.test.metadata.ear;
-
-
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.Test;
-
-import org.jboss.annotation.javaee.Description;
-import org.jboss.annotation.javaee.Descriptions;
-import org.jboss.annotation.javaee.DisplayName;
-import org.jboss.annotation.javaee.DisplayNames;
-import org.jboss.annotation.javaee.Icon;
-import org.jboss.annotation.javaee.Icons;
-import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.metadata.ear.spec.EarMetaData;
-import org.jboss.metadata.ear.spec.ModuleMetaData;
-import org.jboss.metadata.ear.spec.ModulesMetaData;
-import org.jboss.metadata.ear.spec.WebModuleMetaData;
-import org.jboss.metadata.ear.spec.ModuleMetaData.ModuleType;
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
-import org.jboss.metadata.javaee.spec.DisplayNameImpl;
-import org.jboss.metadata.javaee.spec.IconImpl;
-import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
-import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
-import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-
-/**
- * Ear4x tests
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 88255 $
- */
-public class Ear4xUnitTestCase extends AbstractJavaEEMetaDataTest
-{
- public static Test suite()
- {
- return suite(Ear4xUnitTestCase.class);
- }
-
- public Ear4xUnitTestCase(String name)
- {
- super(name);
- }
-
- protected EarMetaData unmarshal() throws Exception
- {
- return unmarshal(EarMetaData.class);
- }
-
- public void testNoDtd() throws Exception
- {
- EarMetaData result = unmarshal();
- assertEquals("JBossTest Web Container Testsuite", result.getDescriptionGroup().getDisplayName());
- ModulesMetaData modules = result.getModules();
- assertNotNull(modules);
- assertEquals(1, modules.size());
- ModuleMetaData module = modules.get(0);
- assertEquals("manifest-web.war", module.getFileName());
- WebModuleMetaData webModule = (WebModuleMetaData) module.getValue();
- assertEquals("/manifest", webModule.getContextRoot());
- }
- public void testVersion14() throws Exception
- {
- EarMetaData result = unmarshal();
- assertEquals("application_1_4-id", result.getId());
- assertEquals("1.4", result.getVersion());
- assertFalse(result.isEE13());
- assertTrue(result.isEE14());
- assertFalse(result.isEE5());
- }
- public void testVersion13() throws Exception
- {
- EarMetaData result = unmarshal();
- assertEquals("application_1_3-id", result.getId());
- assertEquals("1.3", result.getVersion());
- assertTrue(result.isEE13());
- assertFalse(result.isEE14());
- assertFalse(result.isEE5());
- }
-
- public void testDescriptionGroup() throws Exception
- {
- EarMetaData result = unmarshal();
- DescriptionGroupMetaData group = result.getDescriptionGroup();
- assertNotNull(group);
- Descriptions descriptions = group.getDescriptions();
- assertNotNull(descriptions);
-
- DescriptionImpl en = new DescriptionImpl();
- en.setDescription("en-ear-desc");
- DescriptionImpl de = new DescriptionImpl();
- de.setDescription("de-ear-desc");
- de.setLanguage("de");
- DescriptionImpl fr = new DescriptionImpl();
- fr.setDescription("fr-ear-desc");
- fr.setLanguage("fr");
-
- Description[] expected = {en, fr, de};
- assertEquals(expected, descriptions.value());
-
- DisplayNames displayNames = group.getDisplayNames();
- assertNotNull(displayNames);
-
- DisplayNameImpl endn = new DisplayNameImpl();
- endn.setDisplayName("en-ear-disp");
- DisplayNameImpl frdn = new DisplayNameImpl();
- frdn.setDisplayName("fr-ear-disp");
- frdn.setLanguage("fr");
- DisplayNameImpl dedn = new DisplayNameImpl();
- dedn.setDisplayName("de-ear-disp");
- dedn.setLanguage("de");
-
- DisplayName[] expecteddns = {endn, frdn, dedn};
- assertEquals(expecteddns, displayNames.value());
-
- Icons icons = group.getIcons();
- assertNotNull(icons);
- IconImpl enicn = new IconImpl();
- enicn.setId("en-ear-icon-id");
- enicn.setSmallIcon("en-ear-small-icon");
- enicn.setLargeIcon("en-ear-large-icon");
- IconImpl fricn = new IconImpl();
- fricn.setLanguage("fr");
- fricn.setId("fr-ear-icon-id");
- fricn.setSmallIcon("fr-ear-small-icon");
- fricn.setLargeIcon("fr-ear-large-icon");
- IconImpl deicn = new IconImpl();
- deicn.setLanguage("de");
- deicn.setId("de-ear-icon-id");
- deicn.setSmallIcon("de-ear-small-icon");
- deicn.setLargeIcon("de-ear-large-icon");
-
- Icon[] expectedicns = {enicn, fricn, deicn};
- assertEquals(expectedicns, icons.value());
- }
-
- public void testDescriptionGroup13() throws Exception
- {
- EarMetaData result = unmarshal();
- DescriptionGroupMetaData group = result.getDescriptionGroup();
- assertNotNull(group);
- assertEquals("1.3 EE Client", group.getDescription());
- assertEquals("The cts.jar with an application client jar", group.getDisplayName());
- assertNotNull(result.getModules().get("cts.jar"));
- }
-
- public void testSecurityRoles()
- throws Exception
- {
- EarMetaData specMetaData = unmarshal();
- JBossAppMetaData jbossMetaData = unmarshal("Ear4x_testJBossSecurityRoles.xml", JBossAppMetaData.class, null);
- JBossAppMetaData metaData = new JBossAppMetaData();
- metaData.merge(jbossMetaData, specMetaData);
-
- SecurityRolesMetaData secRoles = metaData.getSecurityRoles();
- assertNotNull(secRoles);
- assertEquals(4, secRoles.size());
- // VP
- SecurityRoleMetaData VP = secRoles.get("VP");
- assertNotNull(VP);
- assertEquals("VP", VP.getRoleName());
- assertNull(VP.getPrincipals());
- // Employee
- SecurityRoleMetaData Employee = secRoles.get("Employee");
- assertNotNull(Employee);
- assertEquals("Employee", Employee.getRoleName());
- assertEquals(2, Employee.getPrincipals().size());
- Set<String> principals = Employee.getPrincipals();
- HashSet<String> expected = new HashSet<String>();
- expected.add("javajoe");
- expected.add("j2ee");
- assertEquals(expected, principals);
- // Manager
- SecurityRoleMetaData Manager = secRoles.get("Manager");
- assertNotNull(Manager);
- assertEquals("Manager", Manager.getRoleName());
- assertEquals(1, Manager.getPrincipals().size());
- String[] principalsArray = new String[0];
- principalsArray = Manager.getPrincipals().toArray(principalsArray);
- assertEquals("javajoe", principalsArray[0]);
- // Administrator
- SecurityRoleMetaData Administrator = secRoles.get("Administrator");
- assertNotNull(Administrator);
- assertEquals("Administrator", Administrator.getRoleName());
- assertEquals(1, Administrator.getPrincipals().size());
- principalsArray = new String[0];
- principalsArray = Administrator.getPrincipals().toArray(principalsArray);
- assertEquals("j2ee", principalsArray[0]);
-
- Set<String> j2eeRoles = secRoles.getSecurityRoleNamesByPrincipal("j2ee");
- HashSet<String> expectedj2eeRoles = new HashSet<String>();
- expectedj2eeRoles.add("Employee");
- expectedj2eeRoles.add("Administrator");
- assertEquals(expectedj2eeRoles, j2eeRoles);
- Set<String> javajoeRoles = secRoles.getSecurityRoleNamesByPrincipal("javajoe");
- HashSet<String> expectedjavajoeRoles = new HashSet<String>();
- expectedjavajoeRoles.add("Employee");
- expectedjavajoeRoles.add("Manager");
- assertEquals(expectedjavajoeRoles, javajoeRoles);
-
- SecurityRolesMetaData j2eeRolesMD = secRoles.getSecurityRolesByPrincipal("j2ee");
- assertEquals(2, j2eeRolesMD.size());
- Employee = j2eeRolesMD.get("Employee");
- assertNotNull(Employee);
- assertEquals("Employee", Employee.getRoleName());
- principals = Employee.getPrincipals();
- assertEquals(2, principals.size());
- assertEquals(expected, principals);
- }
-
- /**
- * Test that the merged JBossAppMetaData without any jboss-app.xml input
- * shows all of the application.xml information.
- */
- public void testAppXmlOnly()
- throws Exception
- {
- EarMetaData specMetaData = unmarshal();
- JBossAppMetaData metaData = new JBossAppMetaData();
- metaData.merge(metaData, specMetaData);
-
- assertEquals(6, metaData.getModules().size());
- ModuleMetaData rar = metaData.getModule("rar0.rar");
- assertEquals("connector0", rar.getId());
- assertEquals(ModuleType.Connector, rar.getType());
- assertEquals("META-INF/alt-ra.xml", rar.getAlternativeDD());
- ModuleMetaData car = metaData.getModule("client0.jar");
- assertEquals("java0", car.getId());
- assertEquals(ModuleType.Client, car.getType());
- assertEquals("META-INF/alt-application-client.xml", car.getAlternativeDD());
- ModuleMetaData ejb1 = metaData.getModule("ejb-jar1.jar");
- assertEquals("ejb1", ejb1.getId());
- assertEquals(ModuleType.Ejb, ejb1.getType());
- assertEquals("META-INF/alt-ejb-jar.xml", ejb1.getAlternativeDD());
- ModuleMetaData web1 = metaData.getModule("web-app1.war");
- assertEquals("web1", web1.getId());
- assertEquals(ModuleType.Web, web1.getType());
- assertEquals("WEB-INF/alt-web.xml", web1.getAlternativeDD());
- WebModuleMetaData wm1 = (WebModuleMetaData) web1.getValue();
- assertEquals("/web1", wm1.getContextRoot());
-
- SecurityRolesMetaData roles = metaData.getSecurityRoles();
- assertEquals(2, roles.size());
- SecurityRoleMetaData r0 = roles.get("role0");
- assertEquals("security-role0", r0.getId());
- assertEquals("The 0 security role", r0.getDescriptions().value()[0].value());
- SecurityRoleMetaData r1 = roles.get("role1");
- assertEquals("security-role1", r1.getId());
- assertEquals("The 1 security role", r1.getDescriptions().value()[0].value());
- }
-}
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.metadata.ear;
+
+
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.Test;
+
+import org.jboss.annotation.javaee.Description;
+import org.jboss.annotation.javaee.Descriptions;
+import org.jboss.annotation.javaee.DisplayName;
+import org.jboss.annotation.javaee.DisplayNames;
+import org.jboss.annotation.javaee.Icon;
+import org.jboss.annotation.javaee.Icons;
+import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.metadata.ear.spec.EarMetaData;
+import org.jboss.metadata.ear.spec.ModuleMetaData;
+import org.jboss.metadata.ear.spec.ModulesMetaData;
+import org.jboss.metadata.ear.spec.WebModuleMetaData;
+import org.jboss.metadata.ear.spec.ModuleMetaData.ModuleType;
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.spec.DisplayNameImpl;
+import org.jboss.metadata.javaee.spec.IconImpl;
+import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+
+/**
+ * Ear4x tests
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 88255 $
+ */
+public class Ear4xUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+ public static Test suite()
+ {
+ return suite(Ear4xUnitTestCase.class);
+ }
+
+ public Ear4xUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ protected EarMetaData unmarshal() throws Exception
+ {
+ return unmarshal(EarMetaData.class);
+ }
+
+ public void testNoDtd() throws Exception
+ {
+ EarMetaData result = unmarshal();
+ assertEquals("JBossTest Web Container Testsuite", result.getDescriptionGroup().getDisplayName());
+ ModulesMetaData modules = result.getModules();
+ assertNotNull(modules);
+ assertEquals(1, modules.size());
+ ModuleMetaData module = modules.get(0);
+ assertEquals("manifest-web.war", module.getFileName());
+ WebModuleMetaData webModule = (WebModuleMetaData) module.getValue();
+ assertEquals("/manifest", webModule.getContextRoot());
+ }
+ public void testVersion14() throws Exception
+ {
+ EarMetaData result = unmarshal();
+ assertEquals("application_1_4-id", result.getId());
+ assertEquals("1.4", result.getVersion());
+ assertFalse(result.isEE13());
+ assertTrue(result.isEE14());
+ assertFalse(result.isEE5());
+ }
+ public void testVersion13() throws Exception
+ {
+ EarMetaData result = unmarshal();
+ assertEquals("application_1_3-id", result.getId());
+ assertEquals("1.3", result.getVersion());
+ assertTrue(result.isEE13());
+ assertFalse(result.isEE14());
+ assertFalse(result.isEE5());
+ }
+
+ public void testDescriptionGroup() throws Exception
+ {
+ EarMetaData result = unmarshal();
+ DescriptionGroupMetaData group = result.getDescriptionGroup();
+ assertNotNull(group);
+ Descriptions descriptions = group.getDescriptions();
+ assertNotNull(descriptions);
+
+ DescriptionImpl en = new DescriptionImpl();
+ en.setDescription("en-ear-desc");
+ DescriptionImpl de = new DescriptionImpl();
+ de.setDescription("de-ear-desc");
+ de.setLanguage("de");
+ DescriptionImpl fr = new DescriptionImpl();
+ fr.setDescription("fr-ear-desc");
+ fr.setLanguage("fr");
+
+ Description[] expected = {en, fr, de};
+ assertEquals(expected, descriptions.value());
+
+ DisplayNames displayNames = group.getDisplayNames();
+ assertNotNull(displayNames);
+
+ DisplayNameImpl endn = new DisplayNameImpl();
+ endn.setDisplayName("en-ear-disp");
+ DisplayNameImpl frdn = new DisplayNameImpl();
+ frdn.setDisplayName("fr-ear-disp");
+ frdn.setLanguage("fr");
+ DisplayNameImpl dedn = new DisplayNameImpl();
+ dedn.setDisplayName("de-ear-disp");
+ dedn.setLanguage("de");
+
+ DisplayName[] expecteddns = {endn, frdn, dedn};
+ assertEquals(expecteddns, displayNames.value());
+
+ Icons icons = group.getIcons();
+ assertNotNull(icons);
+ IconImpl enicn = new IconImpl();
+ enicn.setId("en-ear-icon-id");
+ enicn.setSmallIcon("en-ear-small-icon");
+ enicn.setLargeIcon("en-ear-large-icon");
+ IconImpl fricn = new IconImpl();
+ fricn.setLanguage("fr");
+ fricn.setId("fr-ear-icon-id");
+ fricn.setSmallIcon("fr-ear-small-icon");
+ fricn.setLargeIcon("fr-ear-large-icon");
+ IconImpl deicn = new IconImpl();
+ deicn.setLanguage("de");
+ deicn.setId("de-ear-icon-id");
+ deicn.setSmallIcon("de-ear-small-icon");
+ deicn.setLargeIcon("de-ear-large-icon");
+
+ Icon[] expectedicns = {enicn, fricn, deicn};
+ assertEquals(expectedicns, icons.value());
+ }
+
+ public void testDescriptionGroup13() throws Exception
+ {
+ EarMetaData result = unmarshal();
+ DescriptionGroupMetaData group = result.getDescriptionGroup();
+ assertNotNull(group);
+ assertEquals("1.3 EE Client", group.getDescription());
+ assertEquals("The cts.jar with an application client jar", group.getDisplayName());
+ assertNotNull(result.getModules().get("cts.jar"));
+ }
+
+ public void testSecurityRoles()
+ throws Exception
+ {
+ EarMetaData specMetaData = unmarshal();
+ JBossAppMetaData jbossMetaData = unmarshal("Ear4x_testJBossSecurityRoles.xml", JBossAppMetaData.class, null);
+ JBossAppMetaData metaData = new JBossAppMetaData();
+ metaData.merge(jbossMetaData, specMetaData);
+
+ SecurityRolesMetaData secRoles = metaData.getSecurityRoles();
+ assertNotNull(secRoles);
+ assertEquals(4, secRoles.size());
+ // VP
+ SecurityRoleMetaData VP = secRoles.get("VP");
+ assertNotNull(VP);
+ assertEquals("VP", VP.getRoleName());
+ assertNull(VP.getPrincipals());
+ // Employee
+ SecurityRoleMetaData Employee = secRoles.get("Employee");
+ assertNotNull(Employee);
+ assertEquals("Employee", Employee.getRoleName());
+ assertEquals(2, Employee.getPrincipals().size());
+ Set<String> principals = Employee.getPrincipals();
+ HashSet<String> expected = new HashSet<String>();
+ expected.add("javajoe");
+ expected.add("j2ee");
+ assertEquals(expected, principals);
+ // Manager
+ SecurityRoleMetaData Manager = secRoles.get("Manager");
+ assertNotNull(Manager);
+ assertEquals("Manager", Manager.getRoleName());
+ assertEquals(1, Manager.getPrincipals().size());
+ String[] principalsArray = new String[0];
+ principalsArray = Manager.getPrincipals().toArray(principalsArray);
+ assertEquals("javajoe", principalsArray[0]);
+ // Administrator
+ SecurityRoleMetaData Administrator = secRoles.get("Administrator");
+ assertNotNull(Administrator);
+ assertEquals("Administrator", Administrator.getRoleName());
+ assertEquals(1, Administrator.getPrincipals().size());
+ principalsArray = new String[0];
+ principalsArray = Administrator.getPrincipals().toArray(principalsArray);
+ assertEquals("j2ee", principalsArray[0]);
+
+ Set<String> j2eeRoles = secRoles.getSecurityRoleNamesByPrincipal("j2ee");
+ HashSet<String> expectedj2eeRoles = new HashSet<String>();
+ expectedj2eeRoles.add("Employee");
+ expectedj2eeRoles.add("Administrator");
+ assertEquals(expectedj2eeRoles, j2eeRoles);
+ Set<String> javajoeRoles = secRoles.getSecurityRoleNamesByPrincipal("javajoe");
+ HashSet<String> expectedjavajoeRoles = new HashSet<String>();
+ expectedjavajoeRoles.add("Employee");
+ expectedjavajoeRoles.add("Manager");
+ assertEquals(expectedjavajoeRoles, javajoeRoles);
+
+ SecurityRolesMetaData j2eeRolesMD = secRoles.getSecurityRolesByPrincipal("j2ee");
+ assertEquals(2, j2eeRolesMD.size());
+ Employee = j2eeRolesMD.get("Employee");
+ assertNotNull(Employee);
+ assertEquals("Employee", Employee.getRoleName());
+ principals = Employee.getPrincipals();
+ assertEquals(2, principals.size());
+ assertEquals(expected, principals);
+ }
+
+ /**
+ * Test that the merged JBossAppMetaData without any jboss-app.xml input
+ * shows all of the application.xml information.
+ */
+ public void testAppXmlOnly()
+ throws Exception
+ {
+ EarMetaData specMetaData = unmarshal();
+ JBossAppMetaData metaData = new JBossAppMetaData();
+ metaData.merge(metaData, specMetaData);
+
+ assertEquals(6, metaData.getModules().size());
+ ModuleMetaData rar = metaData.getModule("rar0.rar");
+ assertEquals("connector0", rar.getId());
+ assertEquals(ModuleType.Connector, rar.getType());
+ assertEquals("META-INF/alt-ra.xml", rar.getAlternativeDD());
+ ModuleMetaData car = metaData.getModule("client0.jar");
+ assertEquals("java0", car.getId());
+ assertEquals(ModuleType.Client, car.getType());
+ assertEquals("META-INF/alt-application-client.xml", car.getAlternativeDD());
+ ModuleMetaData ejb1 = metaData.getModule("ejb-jar1.jar");
+ assertEquals("ejb1", ejb1.getId());
+ assertEquals(ModuleType.Ejb, ejb1.getType());
+ assertEquals("META-INF/alt-ejb-jar.xml", ejb1.getAlternativeDD());
+ ModuleMetaData web1 = metaData.getModule("web-app1.war");
+ assertEquals("web1", web1.getId());
+ assertEquals(ModuleType.Web, web1.getType());
+ assertEquals("WEB-INF/alt-web.xml", web1.getAlternativeDD());
+ WebModuleMetaData wm1 = (WebModuleMetaData) web1.getValue();
+ assertEquals("/web1", wm1.getContextRoot());
+
+ SecurityRolesMetaData roles = metaData.getSecurityRoles();
+ assertEquals(2, roles.size());
+ SecurityRoleMetaData r0 = roles.get("role0");
+ assertEquals("security-role0", r0.getId());
+ assertEquals("The 0 security role", r0.getDescriptions().value()[0].value());
+ SecurityRoleMetaData r1 = roles.get("role1");
+ assertEquals("security-role1", r1.getId());
+ assertEquals("The 1 security role", r1.getDescriptions().value()[0].value());
+ }
+}
Property changes on: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,208 +1,208 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.test.metadata.ear;
-
-
-import junit.framework.Test;
-
-import org.jboss.annotation.javaee.Description;
-import org.jboss.annotation.javaee.Descriptions;
-import org.jboss.annotation.javaee.DisplayName;
-import org.jboss.annotation.javaee.DisplayNames;
-import org.jboss.annotation.javaee.Icon;
-import org.jboss.annotation.javaee.Icons;
-import org.jboss.metadata.ear.spec.ConnectorModuleMetaData;
-import org.jboss.metadata.ear.spec.Ear50MetaData;
-import org.jboss.metadata.ear.spec.Ear5xMetaData;
-import org.jboss.metadata.ear.spec.EjbModuleMetaData;
-import org.jboss.metadata.ear.spec.JavaModuleMetaData;
-import org.jboss.metadata.ear.spec.ModuleMetaData;
-import org.jboss.metadata.ear.spec.ModulesMetaData;
-import org.jboss.metadata.ear.spec.WebModuleMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
-import org.jboss.metadata.javaee.spec.DisplayNameImpl;
-import org.jboss.metadata.javaee.spec.IconImpl;
-import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
-import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
-import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-
-/**
- * Ear5x tests
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 88255 $
- */
-public class Ear5xEverythingUnitTestCase extends AbstractJavaEEMetaDataTest
-{
- public static Test suite()
- {
- return suite(Ear5xEverythingUnitTestCase.class);
- }
-
- public Ear5xEverythingUnitTestCase(String name)
- {
- super(name);
- }
-
- protected Ear5xMetaData unmarshal() throws Exception
- {
- return unmarshal(Ear50MetaData.class);
- }
-
- public void testEverything() throws Exception
- {
- //enableTrace("org.jboss.xb");
- Ear5xMetaData result = unmarshal();
- assertEquals("application-test-everything", result.getId());
- assertEquals("5", result.getVersion());
- assertDescriptions(result);
- assertDisplayName(result);
- assertIcon(result);
- assertSecurityRoles(result);
- assertLibraryDirectory(result);
- assertModules(result);
- }
-
- protected void assertDescriptions(Ear5xMetaData ear)
- throws Exception
- {
- DescriptionGroupMetaData group = ear.getDescriptionGroup();
- assertNotNull(group);
- Descriptions descriptions = group.getDescriptions();
- assertNotNull(descriptions);
-
- DescriptionImpl den = new DescriptionImpl();
- den.setDescription("en-ear-desc");
- DescriptionImpl dfr = new DescriptionImpl();
- dfr.setLanguage("fr");
- dfr.setDescription("fr-ear-des");
- DescriptionImpl dde = new DescriptionImpl();
- dde.setLanguage("de");
- dde.setDescription("de-ear-des");
- Description[] expected = {den, dfr, dde};
- assertEquals(expected, descriptions.value());
- }
-
- protected void assertDisplayName(Ear5xMetaData ear)
- throws Exception
- {
- DescriptionGroupMetaData group = ear.getDescriptionGroup();
- assertNotNull(group);
- DisplayNames displayNames = group.getDisplayNames();
- assertNotNull(displayNames);
-
- DisplayNameImpl en = new DisplayNameImpl();
- en.setDisplayName("en-ear-disp");
- DisplayNameImpl fr = new DisplayNameImpl();
- fr.setDisplayName("fr-ear-disp");
- fr.setLanguage("fr");
- DisplayNameImpl de = new DisplayNameImpl();
- de.setDisplayName("de-ear-disp");
- de.setLanguage("de");
-
- DisplayName[] expected = {en, fr, de};
- assertEquals(expected, displayNames.value());
- }
-
- protected void assertIcon(Ear5xMetaData ear)
- throws Exception
- {
- DescriptionGroupMetaData group = ear.getDescriptionGroup();
- assertNotNull(group);
- Icons icons = group.getIcons();
- assertNotNull(icons);
-
- IconImpl en = new IconImpl();
- en.setId("en-ear-icon-id");
- en.setSmallIcon("en-ear-small-icon");
- en.setLargeIcon("en-ear-large-icon");
- IconImpl fr = new IconImpl();
- fr.setLanguage("fr");
- fr.setId("fr-ear-icon-id");
- fr.setSmallIcon("fr-ear-small-icon");
- fr.setLargeIcon("fr-ear-large-icon");
- IconImpl de = new IconImpl();
- de.setLanguage("de");
- de.setId("de-ear-icon-id");
- de.setSmallIcon("de-ear-small-icon");
- de.setLargeIcon("de-ear-large-icon");
-
- Icon[] expected = {en, fr, de};
- assertEquals(expected, icons.value());
- }
-
- protected void assertSecurityRoles(Ear5xMetaData ear)
- {
- SecurityRolesMetaData roles = ear.getSecurityRoles();
- assertEquals("There are 2 roles", 2, roles.size());
- SecurityRoleMetaData role0 = roles.get("role0");
- assertEquals("security-role0", role0.getId());
- assertEquals("role0", role0.getName());
- assertEquals("The 0 security role", role0.getDescriptions().value()[0].value());
- SecurityRoleMetaData role1 = roles.get("role1");
- assertEquals("security-role1", role1.getId());
- assertEquals("role1", role1.getName());
- assertEquals("The 1 security role", role1.getDescriptions().value()[0].value());
- }
- protected void assertLibraryDirectory(Ear5xMetaData ear)
- {
- assertEquals("lib0", ear.getLibraryDirectory());
- }
- protected void assertModules(Ear5xMetaData ear)
- {
- ModulesMetaData modules = ear.getModules();
- assertEquals(6, modules.size());
- ModuleMetaData connector = modules.get(0);
- assertEquals("connector0", connector.getId());
- assertEquals("META-INF/alt-ra.xml", connector.getAlternativeDD());
- ConnectorModuleMetaData connectorMD = (ConnectorModuleMetaData) connector.getValue();
- assertEquals("rar0.rar", connectorMD.getConnector());
- ModuleMetaData java = modules.get(1);
- assertEquals("java0", java.getId());
- assertEquals("META-INF/alt-application-client.xml", java.getAlternativeDD());
- JavaModuleMetaData javaMD = (JavaModuleMetaData)java.getValue();
- assertEquals("client0.jar", javaMD.getClientJar());
- ModuleMetaData ejb0 = modules.get(2);
- assertEquals("ejb0", ejb0.getId());
- assertEquals("META-INF/alt-ejb-jar.xml", ejb0.getAlternativeDD());
- EjbModuleMetaData ejb0MD = (EjbModuleMetaData)ejb0.getValue();
- assertEquals("ejb-jar0.jar", ejb0MD.getEjbJar());
- ModuleMetaData ejb1 = modules.get(3);
- assertEquals("ejb1", ejb1.getId());
- assertEquals("META-INF/alt-ejb-jar.xml", ejb1.getAlternativeDD());
- EjbModuleMetaData ejb1MD = (EjbModuleMetaData)ejb1.getValue();
- assertEquals("ejb-jar1.jar", ejb1MD.getEjbJar());
- ModuleMetaData web0 = modules.get(4);
- assertEquals("web0", web0.getId());
- assertEquals("WEB-INF/alt-web.xml", web0.getAlternativeDD());
- WebModuleMetaData web0MD = (WebModuleMetaData) web0.getValue();
- assertEquals("/web0", web0MD.getContextRoot());
- assertEquals("web-app0.war", web0MD.getWebURI());
- ModuleMetaData web1 = modules.get(5);
- assertEquals("web1", web1.getId());
- assertEquals("WEB-INF/alt-web.xml", web1.getAlternativeDD());
- WebModuleMetaData web1MD = (WebModuleMetaData) web1.getValue();
- assertEquals("/web1", web1MD.getContextRoot());
- assertEquals("web-app1.war", web1MD.getWebURI());
- }
-}
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.metadata.ear;
+
+
+import junit.framework.Test;
+
+import org.jboss.annotation.javaee.Description;
+import org.jboss.annotation.javaee.Descriptions;
+import org.jboss.annotation.javaee.DisplayName;
+import org.jboss.annotation.javaee.DisplayNames;
+import org.jboss.annotation.javaee.Icon;
+import org.jboss.annotation.javaee.Icons;
+import org.jboss.metadata.ear.spec.ConnectorModuleMetaData;
+import org.jboss.metadata.ear.spec.Ear50MetaData;
+import org.jboss.metadata.ear.spec.Ear5xMetaData;
+import org.jboss.metadata.ear.spec.EjbModuleMetaData;
+import org.jboss.metadata.ear.spec.JavaModuleMetaData;
+import org.jboss.metadata.ear.spec.ModuleMetaData;
+import org.jboss.metadata.ear.spec.ModulesMetaData;
+import org.jboss.metadata.ear.spec.WebModuleMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.spec.DisplayNameImpl;
+import org.jboss.metadata.javaee.spec.IconImpl;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+
+/**
+ * Ear5x tests
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 88255 $
+ */
+public class Ear5xEverythingUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+ public static Test suite()
+ {
+ return suite(Ear5xEverythingUnitTestCase.class);
+ }
+
+ public Ear5xEverythingUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ protected Ear5xMetaData unmarshal() throws Exception
+ {
+ return unmarshal(Ear50MetaData.class);
+ }
+
+ public void testEverything() throws Exception
+ {
+ //enableTrace("org.jboss.xb");
+ Ear5xMetaData result = unmarshal();
+ assertEquals("application-test-everything", result.getId());
+ assertEquals("5", result.getVersion());
+ assertDescriptions(result);
+ assertDisplayName(result);
+ assertIcon(result);
+ assertSecurityRoles(result);
+ assertLibraryDirectory(result);
+ assertModules(result);
+ }
+
+ protected void assertDescriptions(Ear5xMetaData ear)
+ throws Exception
+ {
+ DescriptionGroupMetaData group = ear.getDescriptionGroup();
+ assertNotNull(group);
+ Descriptions descriptions = group.getDescriptions();
+ assertNotNull(descriptions);
+
+ DescriptionImpl den = new DescriptionImpl();
+ den.setDescription("en-ear-desc");
+ DescriptionImpl dfr = new DescriptionImpl();
+ dfr.setLanguage("fr");
+ dfr.setDescription("fr-ear-des");
+ DescriptionImpl dde = new DescriptionImpl();
+ dde.setLanguage("de");
+ dde.setDescription("de-ear-des");
+ Description[] expected = {den, dfr, dde};
+ assertEquals(expected, descriptions.value());
+ }
+
+ protected void assertDisplayName(Ear5xMetaData ear)
+ throws Exception
+ {
+ DescriptionGroupMetaData group = ear.getDescriptionGroup();
+ assertNotNull(group);
+ DisplayNames displayNames = group.getDisplayNames();
+ assertNotNull(displayNames);
+
+ DisplayNameImpl en = new DisplayNameImpl();
+ en.setDisplayName("en-ear-disp");
+ DisplayNameImpl fr = new DisplayNameImpl();
+ fr.setDisplayName("fr-ear-disp");
+ fr.setLanguage("fr");
+ DisplayNameImpl de = new DisplayNameImpl();
+ de.setDisplayName("de-ear-disp");
+ de.setLanguage("de");
+
+ DisplayName[] expected = {en, fr, de};
+ assertEquals(expected, displayNames.value());
+ }
+
+ protected void assertIcon(Ear5xMetaData ear)
+ throws Exception
+ {
+ DescriptionGroupMetaData group = ear.getDescriptionGroup();
+ assertNotNull(group);
+ Icons icons = group.getIcons();
+ assertNotNull(icons);
+
+ IconImpl en = new IconImpl();
+ en.setId("en-ear-icon-id");
+ en.setSmallIcon("en-ear-small-icon");
+ en.setLargeIcon("en-ear-large-icon");
+ IconImpl fr = new IconImpl();
+ fr.setLanguage("fr");
+ fr.setId("fr-ear-icon-id");
+ fr.setSmallIcon("fr-ear-small-icon");
+ fr.setLargeIcon("fr-ear-large-icon");
+ IconImpl de = new IconImpl();
+ de.setLanguage("de");
+ de.setId("de-ear-icon-id");
+ de.setSmallIcon("de-ear-small-icon");
+ de.setLargeIcon("de-ear-large-icon");
+
+ Icon[] expected = {en, fr, de};
+ assertEquals(expected, icons.value());
+ }
+
+ protected void assertSecurityRoles(Ear5xMetaData ear)
+ {
+ SecurityRolesMetaData roles = ear.getSecurityRoles();
+ assertEquals("There are 2 roles", 2, roles.size());
+ SecurityRoleMetaData role0 = roles.get("role0");
+ assertEquals("security-role0", role0.getId());
+ assertEquals("role0", role0.getName());
+ assertEquals("The 0 security role", role0.getDescriptions().value()[0].value());
+ SecurityRoleMetaData role1 = roles.get("role1");
+ assertEquals("security-role1", role1.getId());
+ assertEquals("role1", role1.getName());
+ assertEquals("The 1 security role", role1.getDescriptions().value()[0].value());
+ }
+ protected void assertLibraryDirectory(Ear5xMetaData ear)
+ {
+ assertEquals("lib0", ear.getLibraryDirectory());
+ }
+ protected void assertModules(Ear5xMetaData ear)
+ {
+ ModulesMetaData modules = ear.getModules();
+ assertEquals(6, modules.size());
+ ModuleMetaData connector = modules.get(0);
+ assertEquals("connector0", connector.getId());
+ assertEquals("META-INF/alt-ra.xml", connector.getAlternativeDD());
+ ConnectorModuleMetaData connectorMD = (ConnectorModuleMetaData) connector.getValue();
+ assertEquals("rar0.rar", connectorMD.getConnector());
+ ModuleMetaData java = modules.get(1);
+ assertEquals("java0", java.getId());
+ assertEquals("META-INF/alt-application-client.xml", java.getAlternativeDD());
+ JavaModuleMetaData javaMD = (JavaModuleMetaData)java.getValue();
+ assertEquals("client0.jar", javaMD.getClientJar());
+ ModuleMetaData ejb0 = modules.get(2);
+ assertEquals("ejb0", ejb0.getId());
+ assertEquals("META-INF/alt-ejb-jar.xml", ejb0.getAlternativeDD());
+ EjbModuleMetaData ejb0MD = (EjbModuleMetaData)ejb0.getValue();
+ assertEquals("ejb-jar0.jar", ejb0MD.getEjbJar());
+ ModuleMetaData ejb1 = modules.get(3);
+ assertEquals("ejb1", ejb1.getId());
+ assertEquals("META-INF/alt-ejb-jar.xml", ejb1.getAlternativeDD());
+ EjbModuleMetaData ejb1MD = (EjbModuleMetaData)ejb1.getValue();
+ assertEquals("ejb-jar1.jar", ejb1MD.getEjbJar());
+ ModuleMetaData web0 = modules.get(4);
+ assertEquals("web0", web0.getId());
+ assertEquals("WEB-INF/alt-web.xml", web0.getAlternativeDD());
+ WebModuleMetaData web0MD = (WebModuleMetaData) web0.getValue();
+ assertEquals("/web0", web0MD.getContextRoot());
+ assertEquals("web-app0.war", web0MD.getWebURI());
+ ModuleMetaData web1 = modules.get(5);
+ assertEquals("web1", web1.getId());
+ assertEquals("WEB-INF/alt-web.xml", web1.getAlternativeDD());
+ WebModuleMetaData web1MD = (WebModuleMetaData) web1.getValue();
+ assertEquals("/web1", web1MD.getContextRoot());
+ assertEquals("web-app1.war", web1MD.getWebURI());
+ }
+}
Property changes on: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xEverythingUnitTestCase.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
===================================================================
--- projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,153 +1,153 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.test.metadata.ear;
-
-
-import junit.framework.Test;
-
-import org.jboss.annotation.javaee.Description;
-import org.jboss.annotation.javaee.Descriptions;
-import org.jboss.annotation.javaee.DisplayName;
-import org.jboss.annotation.javaee.DisplayNames;
-import org.jboss.annotation.javaee.Icon;
-import org.jboss.annotation.javaee.Icons;
-import org.jboss.metadata.ear.spec.Ear50MetaData;
-import org.jboss.metadata.ear.spec.Ear5xMetaData;
-import org.jboss.metadata.ear.spec.ModulesMetaData;
-import org.jboss.metadata.ear.spec.WebModuleMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.javaee.spec.DescriptionImpl;
-import org.jboss.metadata.javaee.spec.DisplayNameImpl;
-import org.jboss.metadata.javaee.spec.IconImpl;
-import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-
-/**
- * Ear5x tests
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 88255 $
- */
-public class Ear5xUnitTestCase extends AbstractJavaEEMetaDataTest
-{
- public static Test suite()
- {
- return suite(Ear5xUnitTestCase.class);
- }
-
- public static boolean validateSchema()
- {
- return true;
- }
-
- public Ear5xUnitTestCase(String name)
- {
- super(name);
- }
-
- protected Ear5xMetaData unmarshal() throws Exception
- {
- return unmarshal(Ear50MetaData.class);
- }
-
- public void testId() throws Exception
- {
- Ear5xMetaData result = unmarshal();
- assertEquals("application-test-id", result.getId());
- }
-
- public void testVersion() throws Exception
- {
- Ear5xMetaData result = unmarshal();
- assertEquals("5", result.getVersion());
- assertFalse(result.isEE14());
- assertTrue(result.isEE5());
- }
-
- public void testDescriptionGroup() throws Exception
- {
- Ear5xMetaData result = unmarshal();
- DescriptionGroupMetaData group = result.getDescriptionGroup();
- assertNotNull(group);
- Descriptions descriptions = group.getDescriptions();
- assertNotNull(descriptions);
-
- DescriptionImpl en = new DescriptionImpl();
- en.setDescription("en-ear-desc");
- DescriptionImpl de = new DescriptionImpl();
- de.setDescription("de-ear-desc");
- de.setLanguage("de");
- DescriptionImpl fr = new DescriptionImpl();
- fr.setDescription("fr-ear-desc");
- fr.setLanguage("fr");
-
- Description[] expected = {en, fr, de};
- assertEquals(expected, descriptions.value());
-
- DisplayNames displayNames = group.getDisplayNames();
- assertNotNull(displayNames);
-
- DisplayNameImpl endn = new DisplayNameImpl();
- endn.setDisplayName("en-ear-disp");
- DisplayNameImpl frdn = new DisplayNameImpl();
- frdn.setDisplayName("fr-ear-disp");
- frdn.setLanguage("fr");
- DisplayNameImpl dedn = new DisplayNameImpl();
- dedn.setDisplayName("de-ear-disp");
- dedn.setLanguage("de");
-
- DisplayName[] expecteddns = {endn, frdn, dedn};
- assertEquals(expecteddns, displayNames.value());
-
- Icons icons = group.getIcons();
- assertNotNull(icons);
- IconImpl enicn = new IconImpl();
- enicn.setId("en-ear-icon-id");
- enicn.setSmallIcon("en-ear-small-icon");
- enicn.setLargeIcon("en-ear-large-icon");
- IconImpl fricn = new IconImpl();
- fricn.setLanguage("fr");
- fricn.setId("fr-ear-icon-id");
- fricn.setSmallIcon("fr-ear-small-icon");
- fricn.setLargeIcon("fr-ear-large-icon");
- IconImpl deicn = new IconImpl();
- deicn.setLanguage("de");
- deicn.setId("de-ear-icon-id");
- deicn.setSmallIcon("de-ear-small-icon");
- deicn.setLargeIcon("de-ear-large-icon");
-
- Icon[] expectedicns = {enicn, fricn, deicn};
- assertEquals(expectedicns, icons.value());
- }
-
- public void testWhitespace()
- throws Exception
- {
- Ear5xMetaData result = unmarshal();
- ModulesMetaData modules = result.getModules();
- assertEquals(4, modules.size());
- assertEquals("transport_ejb_vehicle_client.jar", modules.get(0).getName());
- assertEquals("transport_ejb_vehicle_ejb.jar", modules.get(1).getName());
- assertEquals("transport_jsp_vehicle_web.war", modules.get(2).getName());
- assertEquals("transport_servlet_vehicle_web.war", modules.get(3).getName());
- assertEquals("transport_servlet_vehicle", ((WebModuleMetaData)modules.get(3).getValue()).getContextRoot());
- }
-}
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.metadata.ear;
+
+
+import junit.framework.Test;
+
+import org.jboss.annotation.javaee.Description;
+import org.jboss.annotation.javaee.Descriptions;
+import org.jboss.annotation.javaee.DisplayName;
+import org.jboss.annotation.javaee.DisplayNames;
+import org.jboss.annotation.javaee.Icon;
+import org.jboss.annotation.javaee.Icons;
+import org.jboss.metadata.ear.spec.Ear50MetaData;
+import org.jboss.metadata.ear.spec.Ear5xMetaData;
+import org.jboss.metadata.ear.spec.ModulesMetaData;
+import org.jboss.metadata.ear.spec.WebModuleMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
+import org.jboss.metadata.javaee.spec.DisplayNameImpl;
+import org.jboss.metadata.javaee.spec.IconImpl;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+
+/**
+ * Ear5x tests
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 88255 $
+ */
+public class Ear5xUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+ public static Test suite()
+ {
+ return suite(Ear5xUnitTestCase.class);
+ }
+
+ public static boolean validateSchema()
+ {
+ return true;
+ }
+
+ public Ear5xUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ protected Ear5xMetaData unmarshal() throws Exception
+ {
+ return unmarshal(Ear50MetaData.class);
+ }
+
+ public void testId() throws Exception
+ {
+ Ear5xMetaData result = unmarshal();
+ assertEquals("application-test-id", result.getId());
+ }
+
+ public void testVersion() throws Exception
+ {
+ Ear5xMetaData result = unmarshal();
+ assertEquals("5", result.getVersion());
+ assertFalse(result.isEE14());
+ assertTrue(result.isEE5());
+ }
+
+ public void testDescriptionGroup() throws Exception
+ {
+ Ear5xMetaData result = unmarshal();
+ DescriptionGroupMetaData group = result.getDescriptionGroup();
+ assertNotNull(group);
+ Descriptions descriptions = group.getDescriptions();
+ assertNotNull(descriptions);
+
+ DescriptionImpl en = new DescriptionImpl();
+ en.setDescription("en-ear-desc");
+ DescriptionImpl de = new DescriptionImpl();
+ de.setDescription("de-ear-desc");
+ de.setLanguage("de");
+ DescriptionImpl fr = new DescriptionImpl();
+ fr.setDescription("fr-ear-desc");
+ fr.setLanguage("fr");
+
+ Description[] expected = {en, fr, de};
+ assertEquals(expected, descriptions.value());
+
+ DisplayNames displayNames = group.getDisplayNames();
+ assertNotNull(displayNames);
+
+ DisplayNameImpl endn = new DisplayNameImpl();
+ endn.setDisplayName("en-ear-disp");
+ DisplayNameImpl frdn = new DisplayNameImpl();
+ frdn.setDisplayName("fr-ear-disp");
+ frdn.setLanguage("fr");
+ DisplayNameImpl dedn = new DisplayNameImpl();
+ dedn.setDisplayName("de-ear-disp");
+ dedn.setLanguage("de");
+
+ DisplayName[] expecteddns = {endn, frdn, dedn};
+ assertEquals(expecteddns, displayNames.value());
+
+ Icons icons = group.getIcons();
+ assertNotNull(icons);
+ IconImpl enicn = new IconImpl();
+ enicn.setId("en-ear-icon-id");
+ enicn.setSmallIcon("en-ear-small-icon");
+ enicn.setLargeIcon("en-ear-large-icon");
+ IconImpl fricn = new IconImpl();
+ fricn.setLanguage("fr");
+ fricn.setId("fr-ear-icon-id");
+ fricn.setSmallIcon("fr-ear-small-icon");
+ fricn.setLargeIcon("fr-ear-large-icon");
+ IconImpl deicn = new IconImpl();
+ deicn.setLanguage("de");
+ deicn.setId("de-ear-icon-id");
+ deicn.setSmallIcon("de-ear-small-icon");
+ deicn.setLargeIcon("de-ear-large-icon");
+
+ Icon[] expectedicns = {enicn, fricn, deicn};
+ assertEquals(expectedicns, icons.value());
+ }
+
+ public void testWhitespace()
+ throws Exception
+ {
+ Ear5xMetaData result = unmarshal();
+ ModulesMetaData modules = result.getModules();
+ assertEquals(4, modules.size());
+ assertEquals("transport_ejb_vehicle_client.jar", modules.get(0).getName());
+ assertEquals("transport_ejb_vehicle_ejb.jar", modules.get(1).getName());
+ assertEquals("transport_jsp_vehicle_web.war", modules.get(2).getName());
+ assertEquals("transport_servlet_vehicle_web.war", modules.get(3).getName());
+ assertEquals("transport_servlet_vehicle", ((WebModuleMetaData)modules.get(3).getValue()).getContextRoot());
+ }
+}
Property changes on: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/EarTestSuite.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,185 +1,185 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.test.metadata.ear;
-
-
-import junit.framework.Test;
-
-import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
-import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
-import org.jboss.metadata.ear.spec.ConnectorModuleMetaData;
-import org.jboss.metadata.ear.spec.Ear5xMetaData;
-import org.jboss.metadata.ear.spec.EjbModuleMetaData;
-import org.jboss.metadata.ear.spec.JavaModuleMetaData;
-import org.jboss.metadata.ear.spec.ModuleMetaData;
-import org.jboss.metadata.ear.spec.ModulesMetaData;
-import org.jboss.metadata.ear.spec.WebModuleMetaData;
-import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
-import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
-import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-
-/**
- * Ear5x tests
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 88255 $
- */
-public class JBossApp5xEverythingUnitTestCase extends AbstractJavaEEMetaDataTest
-{
- private boolean hasJBossAppOverride = false;
-
- public static Test suite()
- {
- return suite(JBossApp5xEverythingUnitTestCase.class);
- }
-
- public JBossApp5xEverythingUnitTestCase(String name)
- {
- super(name);
- }
-
- protected JBossAppMetaData unmarshal() throws Exception
- {
- return unmarshal(JBoss50AppMetaData.class);
- }
-
- public void testOverride()
- throws Exception
- {
- Ear5xMetaData spec = unmarshal("Ear5xEverything_testEverything.xml", Ear5xMetaData.class, null);
- JBossAppMetaData jbossAppMD = new JBossAppMetaData();
- jbossAppMD.merge(null, spec);
- hasJBossAppOverride = false;
- assertEveryting(jbossAppMD);
- }
- public void testEverything()
- throws Exception
- {
- //enableTrace("org.jboss.xb");
- Ear5xMetaData spec = unmarshal("Ear5xEverything_testEverything.xml", Ear5xMetaData.class, null);
- JBossAppMetaData jbossAppXml = unmarshal();
- JBossAppMetaData jbossAppMD = new JBossAppMetaData();
- jbossAppMD.merge(jbossAppXml, spec);
- hasJBossAppOverride = true;
- assertEveryting(jbossAppMD);
- assertEquals("jboss-app-id", jbossAppMD.getId());
- assertEquals("5.0", jbossAppMD.getVersion());
- assertEveryting(jbossAppMD);
- }
-
- protected void assertEveryting(JBossAppMetaData ear)
- throws Exception
- {
- assertSecurityRoles(ear);
- assertLibraryDirectory(ear);
- assertModules(ear);
- }
-
- protected void assertSecurityRoles(JBossAppMetaData ear)
- {
- SecurityRolesMetaData roles = ear.getSecurityRoles();
- assertEquals("There are 2 roles", 2, roles.size());
- SecurityRoleMetaData role0 = roles.get("role0");
- assertEquals("security-role0", role0.getId());
- assertEquals("role0", role0.getName());
- assertEquals("The 0 security role", role0.getDescriptions().value()[0].value());
- SecurityRoleMetaData role1 = roles.get("role1");
- assertEquals("security-role1", role1.getId());
- assertEquals("role1", role1.getName());
- assertEquals("The 1 security role", role1.getDescriptions().value()[0].value());
- if(hasJBossAppOverride)
- {
- assertTrue("1 principal in role0", role0.getPrincipals().size() == 1);
- assertEquals("principal0", role0.getPrincipals().toArray()[0]);
- assertEquals("principal1", role1.getPrincipals().toArray()[0]);
- }
- }
- protected void assertLibraryDirectory(JBossAppMetaData ear)
- {
- if(hasJBossAppOverride)
- assertEquals("jboss-app-lib0", ear.getLibraryDirectory());
- else
- assertEquals("lib0", ear.getLibraryDirectory());
- }
- protected void assertModules(JBossAppMetaData ear)
- {
- ModulesMetaData modules = ear.getModules();
- if(hasJBossAppOverride)
- assertEquals(9, modules.size());
- else
- assertEquals(6, modules.size());
- ModuleMetaData connector = modules.get(0);
- assertEquals("connector0", connector.getId());
- ConnectorModuleMetaData connectorMD = (ConnectorModuleMetaData) connector.getValue();
- assertEquals("rar0.rar", connectorMD.getConnector());
- ModuleMetaData java = modules.get(1);
- assertEquals("java0", java.getId());
- JavaModuleMetaData javaMD = (JavaModuleMetaData)java.getValue();
- assertEquals("client0.jar", javaMD.getClientJar());
- ModuleMetaData ejb0 = modules.get(2);
- assertEquals("ejb0", ejb0.getId());
- EjbModuleMetaData ejb0MD = (EjbModuleMetaData)ejb0.getValue();
- assertEquals("ejb-jar0.jar", ejb0MD.getEjbJar());
- ModuleMetaData ejb1 = modules.get(3);
- assertEquals("ejb1", ejb1.getId());
- EjbModuleMetaData ejb1MD = (EjbModuleMetaData)ejb1.getValue();
- assertEquals("ejb-jar1.jar", ejb1MD.getEjbJar());
- ModuleMetaData web0 = modules.get(4);
- assertEquals("web0", web0.getId());
- WebModuleMetaData web0MD = (WebModuleMetaData) web0.getValue();
- assertEquals("/web0", web0MD.getContextRoot());
- assertEquals("web-app0.war", web0MD.getWebURI());
- ModuleMetaData web1 = modules.get(5);
- assertEquals("web1", web1.getId());
- WebModuleMetaData web1MD = (WebModuleMetaData) web1.getValue();
- if(hasJBossAppOverride)
- assertEquals("/web1-override", web1MD.getContextRoot());
- else
- assertEquals("/web1", web1MD.getContextRoot());
- assertEquals("web-app1.war", web1MD.getWebURI());
- if(hasJBossAppOverride)
- {
- // Validate the sar, web2, har added in jboss-app.xml
- ModuleMetaData sar = modules.get(6);
- assertEquals("sar0", sar.getId());
- ServiceModuleMetaData sarMD = (ServiceModuleMetaData) sar.getValue();
- assertEquals("sar0.sar", sarMD.getSar());
- ModuleMetaData web2 = modules.get(7);
- assertEquals("web2", web2.getId());
- WebModuleMetaData web2MD = (WebModuleMetaData) web2.getValue();
- assertEquals("/web2", web2MD.getContextRoot());
- assertEquals("web-app2.war", web2MD.getWebURI());
- ModuleMetaData har = modules.get(8);
- assertEquals("har0", har.getId());
- ServiceModuleMetaData harMD = (ServiceModuleMetaData) har.getValue();
- assertEquals("har0.har", harMD.getSar());
- }
- // Validate lookup by module file name
- ModuleMetaData mmd = modules.get("rar0.rar");
- assertEquals(connector, mmd);
- mmd = modules.get("ejb-jar1.jar");
- assertEquals(ejb1, mmd);
- mmd = modules.get("web-app0.war");
- assertEquals(web0, mmd);
- }
-}
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.metadata.ear;
+
+
+import junit.framework.Test;
+
+import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
+import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.metadata.ear.jboss.ServiceModuleMetaData;
+import org.jboss.metadata.ear.spec.ConnectorModuleMetaData;
+import org.jboss.metadata.ear.spec.Ear5xMetaData;
+import org.jboss.metadata.ear.spec.EjbModuleMetaData;
+import org.jboss.metadata.ear.spec.JavaModuleMetaData;
+import org.jboss.metadata.ear.spec.ModuleMetaData;
+import org.jboss.metadata.ear.spec.ModulesMetaData;
+import org.jboss.metadata.ear.spec.WebModuleMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRoleMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+
+/**
+ * Ear5x tests
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 88255 $
+ */
+public class JBossApp5xEverythingUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+ private boolean hasJBossAppOverride = false;
+
+ public static Test suite()
+ {
+ return suite(JBossApp5xEverythingUnitTestCase.class);
+ }
+
+ public JBossApp5xEverythingUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ protected JBossAppMetaData unmarshal() throws Exception
+ {
+ return unmarshal(JBoss50AppMetaData.class);
+ }
+
+ public void testOverride()
+ throws Exception
+ {
+ Ear5xMetaData spec = unmarshal("Ear5xEverything_testEverything.xml", Ear5xMetaData.class, null);
+ JBossAppMetaData jbossAppMD = new JBossAppMetaData();
+ jbossAppMD.merge(null, spec);
+ hasJBossAppOverride = false;
+ assertEveryting(jbossAppMD);
+ }
+ public void testEverything()
+ throws Exception
+ {
+ //enableTrace("org.jboss.xb");
+ Ear5xMetaData spec = unmarshal("Ear5xEverything_testEverything.xml", Ear5xMetaData.class, null);
+ JBossAppMetaData jbossAppXml = unmarshal();
+ JBossAppMetaData jbossAppMD = new JBossAppMetaData();
+ jbossAppMD.merge(jbossAppXml, spec);
+ hasJBossAppOverride = true;
+ assertEveryting(jbossAppMD);
+ assertEquals("jboss-app-id", jbossAppMD.getId());
+ assertEquals("5.0", jbossAppMD.getVersion());
+ assertEveryting(jbossAppMD);
+ }
+
+ protected void assertEveryting(JBossAppMetaData ear)
+ throws Exception
+ {
+ assertSecurityRoles(ear);
+ assertLibraryDirectory(ear);
+ assertModules(ear);
+ }
+
+ protected void assertSecurityRoles(JBossAppMetaData ear)
+ {
+ SecurityRolesMetaData roles = ear.getSecurityRoles();
+ assertEquals("There are 2 roles", 2, roles.size());
+ SecurityRoleMetaData role0 = roles.get("role0");
+ assertEquals("security-role0", role0.getId());
+ assertEquals("role0", role0.getName());
+ assertEquals("The 0 security role", role0.getDescriptions().value()[0].value());
+ SecurityRoleMetaData role1 = roles.get("role1");
+ assertEquals("security-role1", role1.getId());
+ assertEquals("role1", role1.getName());
+ assertEquals("The 1 security role", role1.getDescriptions().value()[0].value());
+ if(hasJBossAppOverride)
+ {
+ assertTrue("1 principal in role0", role0.getPrincipals().size() == 1);
+ assertEquals("principal0", role0.getPrincipals().toArray()[0]);
+ assertEquals("principal1", role1.getPrincipals().toArray()[0]);
+ }
+ }
+ protected void assertLibraryDirectory(JBossAppMetaData ear)
+ {
+ if(hasJBossAppOverride)
+ assertEquals("jboss-app-lib0", ear.getLibraryDirectory());
+ else
+ assertEquals("lib0", ear.getLibraryDirectory());
+ }
+ protected void assertModules(JBossAppMetaData ear)
+ {
+ ModulesMetaData modules = ear.getModules();
+ if(hasJBossAppOverride)
+ assertEquals(9, modules.size());
+ else
+ assertEquals(6, modules.size());
+ ModuleMetaData connector = modules.get(0);
+ assertEquals("connector0", connector.getId());
+ ConnectorModuleMetaData connectorMD = (ConnectorModuleMetaData) connector.getValue();
+ assertEquals("rar0.rar", connectorMD.getConnector());
+ ModuleMetaData java = modules.get(1);
+ assertEquals("java0", java.getId());
+ JavaModuleMetaData javaMD = (JavaModuleMetaData)java.getValue();
+ assertEquals("client0.jar", javaMD.getClientJar());
+ ModuleMetaData ejb0 = modules.get(2);
+ assertEquals("ejb0", ejb0.getId());
+ EjbModuleMetaData ejb0MD = (EjbModuleMetaData)ejb0.getValue();
+ assertEquals("ejb-jar0.jar", ejb0MD.getEjbJar());
+ ModuleMetaData ejb1 = modules.get(3);
+ assertEquals("ejb1", ejb1.getId());
+ EjbModuleMetaData ejb1MD = (EjbModuleMetaData)ejb1.getValue();
+ assertEquals("ejb-jar1.jar", ejb1MD.getEjbJar());
+ ModuleMetaData web0 = modules.get(4);
+ assertEquals("web0", web0.getId());
+ WebModuleMetaData web0MD = (WebModuleMetaData) web0.getValue();
+ assertEquals("/web0", web0MD.getContextRoot());
+ assertEquals("web-app0.war", web0MD.getWebURI());
+ ModuleMetaData web1 = modules.get(5);
+ assertEquals("web1", web1.getId());
+ WebModuleMetaData web1MD = (WebModuleMetaData) web1.getValue();
+ if(hasJBossAppOverride)
+ assertEquals("/web1-override", web1MD.getContextRoot());
+ else
+ assertEquals("/web1", web1MD.getContextRoot());
+ assertEquals("web-app1.war", web1MD.getWebURI());
+ if(hasJBossAppOverride)
+ {
+ // Validate the sar, web2, har added in jboss-app.xml
+ ModuleMetaData sar = modules.get(6);
+ assertEquals("sar0", sar.getId());
+ ServiceModuleMetaData sarMD = (ServiceModuleMetaData) sar.getValue();
+ assertEquals("sar0.sar", sarMD.getSar());
+ ModuleMetaData web2 = modules.get(7);
+ assertEquals("web2", web2.getId());
+ WebModuleMetaData web2MD = (WebModuleMetaData) web2.getValue();
+ assertEquals("/web2", web2MD.getContextRoot());
+ assertEquals("web-app2.war", web2MD.getWebURI());
+ ModuleMetaData har = modules.get(8);
+ assertEquals("har0", har.getId());
+ ServiceModuleMetaData harMD = (ServiceModuleMetaData) har.getValue();
+ assertEquals("har0.har", harMD.getSar());
+ }
+ // Validate lookup by module file name
+ ModuleMetaData mmd = modules.get("rar0.rar");
+ assertEquals(connector, mmd);
+ mmd = modules.get("ejb-jar1.jar");
+ assertEquals(ejb1, mmd);
+ mmd = modules.get("web-app0.war");
+ assertEquals(web0, mmd);
+ }
+}
Property changes on: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xEverythingUnitTestCase.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
===================================================================
--- projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,89 +1,89 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.test.metadata.ear;
-
-
-import junit.framework.Test;
-
-import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
-import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.metadata.ear.spec.ModuleMetaData;
-import org.jboss.metadata.ear.spec.ModulesMetaData;
-import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-
-/**
- * Ear4x tests
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision: 88255 $
- */
-public class JBossApp5xUnitTestCase extends AbstractJavaEEMetaDataTest
-{
- public static Test suite()
- {
- return suite(JBossApp5xUnitTestCase.class);
- }
-
- public JBossApp5xUnitTestCase(String name)
- {
- super(name);
- }
-
- protected JBossAppMetaData unmarshal() throws Exception
- {
- return unmarshal(JBossAppMetaData.class);
- }
-
- public void testVersion40() throws Exception
- {
- JBossAppMetaData result = unmarshal();
- assertEquals("4.0", result.getVersion());
- }
-
- public void testVersion42() throws Exception
- {
- JBossAppMetaData result = unmarshal();
- assertEquals("4.2", result.getVersion());
- }
-
- public void testVersion50() throws Exception
- {
- JBossAppMetaData result = unmarshal();
- assertEquals("jboss-app_5_0-id", result.getId());
- assertEquals("5.0", result.getVersion());
- }
-
- public void testEmptyMetaData()
- {
- JBossAppMetaData appMetaData = new JBoss50AppMetaData();
- ModulesMetaData modules = new ModulesMetaData();
- appMetaData.setModules(modules);
- ModuleMetaData module = appMetaData.getModule("something");
- assertNull(module);
- }
-
- public void testModuleOrder() throws Exception
- {
- JBossAppMetaData result = unmarshal();
- assertEquals("4.0", result.getVersion());
- }
-}
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.test.metadata.ear;
+
+
+import junit.framework.Test;
+
+import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
+import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.metadata.ear.spec.ModuleMetaData;
+import org.jboss.metadata.ear.spec.ModulesMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+
+/**
+ * Ear4x tests
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision: 88255 $
+ */
+public class JBossApp5xUnitTestCase extends AbstractJavaEEMetaDataTest
+{
+ public static Test suite()
+ {
+ return suite(JBossApp5xUnitTestCase.class);
+ }
+
+ public JBossApp5xUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ protected JBossAppMetaData unmarshal() throws Exception
+ {
+ return unmarshal(JBossAppMetaData.class);
+ }
+
+ public void testVersion40() throws Exception
+ {
+ JBossAppMetaData result = unmarshal();
+ assertEquals("4.0", result.getVersion());
+ }
+
+ public void testVersion42() throws Exception
+ {
+ JBossAppMetaData result = unmarshal();
+ assertEquals("4.2", result.getVersion());
+ }
+
+ public void testVersion50() throws Exception
+ {
+ JBossAppMetaData result = unmarshal();
+ assertEquals("jboss-app_5_0-id", result.getId());
+ assertEquals("5.0", result.getVersion());
+ }
+
+ public void testEmptyMetaData()
+ {
+ JBossAppMetaData appMetaData = new JBoss50AppMetaData();
+ ModulesMetaData modules = new ModulesMetaData();
+ appMetaData.setModules(modules);
+ ModuleMetaData module = appMetaData.getModule("something");
+ assertNull(module);
+ }
+
+ public void testModuleOrder() throws Exception
+ {
+ JBossAppMetaData result = unmarshal();
+ assertEquals("4.0", result.getVersion());
+ }
+}
Property changes on: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/JBossApp5xUnitTestCase.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/xml/EarXmlValidationUnitTestCase.java
===================================================================
--- projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/xml/EarXmlValidationUnitTestCase.java 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/xml/EarXmlValidationUnitTestCase.java 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,37 +1,37 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.test.metadata.xml;
-
-/**
- * A XmlValidationUnitTestCase.
- *
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
-public class EarXmlValidationUnitTestCase extends XmlValidationUnitTestCase
-{
- public void setUp() throws Exception
- {
- super.setUp();
- exclude("Ear4x_testNoDtd.xml");
- }
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.test.metadata.xml;
+
+/**
+ * A XmlValidationUnitTestCase.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public class EarXmlValidationUnitTestCase extends XmlValidationUnitTestCase
+{
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ exclude("Ear4x_testNoDtd.xml");
+ }
+}
Property changes on: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/xml/EarXmlValidationUnitTestCase.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/log4j.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/log4j.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/log4j.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,115 +1,115 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml 66189 2007-10-16 17:45:14Z scott.stark at jboss.org $ -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <param name="File" value="target/test.log"/>
- <param name="Threshold" value="INFO"/>
- <param name="Append" value="false"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <!-- Rollover at the top of each hour
- <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
- -->
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- A size based file rolling appender
- <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
- <param name="File" value="${jboss.server.home.dir}/log/server.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500KB"/>
- <param name="MaxBackupIndex" value="1"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
- -->
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="TRACE"/>
- <param name="Target" value="System.out"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <!-- Limit JBoss categories to INFO
- <category name="org.jboss">
- <priority value="INFO" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- Increase the priority threshold for the DefaultDS category
- <category name="DefaultDS">
- <priority value="FATAL"/>
- </category>
- -->
-
- <!-- Decrease the priority threshold for the org.jboss.varia category
- <category name="org.jboss.varia">
- <priority value="DEBUG"/>
- </category>
- -->
-
- <!--
- | An example of enabling the custom TRACE level priority that is used
- | by the JBoss internals to diagnose low level details. This example
- | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
- | subpackages. This will produce A LOT of logging output.
- <category name="org.jboss.system">
- <priority value="TRACE" class="org.jboss.logging.XLevel"/>
- </category>
- -->
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 66189 2007-10-16 17:45:14Z scott.stark at jboss.org $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <param name="File" value="target/test.log"/>
+ <param name="Threshold" value="INFO"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- A size based file rolling appender
+ <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+ <param name="File" value="${jboss.server.home.dir}/log/server.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="TRACE"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Limit JBoss categories to INFO
+ <category name="org.jboss">
+ <priority value="INFO" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!-- Increase the priority threshold for the DefaultDS category
+ <category name="DefaultDS">
+ <priority value="FATAL"/>
+ </category>
+ -->
+
+ <!-- Decrease the priority threshold for the org.jboss.varia category
+ <category name="org.jboss.varia">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <!--
+ | An example of enabling the custom TRACE level priority that is used
+ | by the JBoss internals to diagnose low level details. This example
+ | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+ | subpackages. This will produce A LOT of logging output.
+ <category name="org.jboss.system">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: projects/metadata/ear/trunk/src/test/resources/log4j.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testAppXmlOnly.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testAppXmlOnly.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testAppXmlOnly.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
- version="1.4" id="application_1_4-id">
-
- <description>en-ear-desc</description>
- <description xml:lang="fr">fr-ear-desc</description>
- <description xml:lang="de">de-ear-desc</description>
- <display-name>en-ear-disp</display-name>
- <display-name xml:lang="fr">fr-ear-disp</display-name>
- <display-name xml:lang="de">de-ear-disp</display-name>
- <icon id="en-ear-icon-id">
- <small-icon>en-ear-small-icon</small-icon>
- <large-icon>en-ear-large-icon</large-icon>
- </icon>
- <icon xml:lang="fr" id="fr-ear-icon-id">
- <small-icon>fr-ear-small-icon</small-icon>
- <large-icon>fr-ear-large-icon</large-icon>
- </icon>
- <icon xml:lang="de" id="de-ear-icon-id">
- <small-icon>de-ear-small-icon</small-icon>
- <large-icon>de-ear-large-icon</large-icon>
- </icon>
-
- <module id="connector0">
- <connector>rar0.rar</connector>
- <alt-dd>META-INF/alt-ra.xml</alt-dd>
- </module>
- <module id="java0">
- <java>client0.jar</java>
- <alt-dd>META-INF/alt-application-client.xml</alt-dd>
- </module>
- <module id="ejb0">
- <ejb>ejb-jar0.jar</ejb>
- <alt-dd>META-INF/alt-ejb-jar.xml</alt-dd>
- </module>
- <module id="ejb1">
- <ejb>ejb-jar1.jar</ejb>
- <alt-dd>META-INF/alt-ejb-jar.xml</alt-dd>
- </module>
- <module id="web0">
- <web>
- <web-uri>web-app0.war</web-uri>
- <context-root>/web0</context-root>
- </web>
- <alt-dd>WEB-INF/alt-web.xml</alt-dd>
- </module>
- <module id="web1">
- <web>
- <web-uri>web-app1.war</web-uri>
- <context-root>/web1</context-root>
- </web>
- <alt-dd>WEB-INF/alt-web.xml</alt-dd>
- </module>
- <security-role id="security-role0">
- <description>The 0 security role</description>
- <role-name>role0</role-name>
- </security-role>
- <security-role id="security-role1">
- <description>The 1 security role</description>
- <role-name>role1</role-name>
- </security-role>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
+ version="1.4" id="application_1_4-id">
+
+ <description>en-ear-desc</description>
+ <description xml:lang="fr">fr-ear-desc</description>
+ <description xml:lang="de">de-ear-desc</description>
+ <display-name>en-ear-disp</display-name>
+ <display-name xml:lang="fr">fr-ear-disp</display-name>
+ <display-name xml:lang="de">de-ear-disp</display-name>
+ <icon id="en-ear-icon-id">
+ <small-icon>en-ear-small-icon</small-icon>
+ <large-icon>en-ear-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-ear-icon-id">
+ <small-icon>fr-ear-small-icon</small-icon>
+ <large-icon>fr-ear-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-ear-icon-id">
+ <small-icon>de-ear-small-icon</small-icon>
+ <large-icon>de-ear-large-icon</large-icon>
+ </icon>
+
+ <module id="connector0">
+ <connector>rar0.rar</connector>
+ <alt-dd>META-INF/alt-ra.xml</alt-dd>
+ </module>
+ <module id="java0">
+ <java>client0.jar</java>
+ <alt-dd>META-INF/alt-application-client.xml</alt-dd>
+ </module>
+ <module id="ejb0">
+ <ejb>ejb-jar0.jar</ejb>
+ <alt-dd>META-INF/alt-ejb-jar.xml</alt-dd>
+ </module>
+ <module id="ejb1">
+ <ejb>ejb-jar1.jar</ejb>
+ <alt-dd>META-INF/alt-ejb-jar.xml</alt-dd>
+ </module>
+ <module id="web0">
+ <web>
+ <web-uri>web-app0.war</web-uri>
+ <context-root>/web0</context-root>
+ </web>
+ <alt-dd>WEB-INF/alt-web.xml</alt-dd>
+ </module>
+ <module id="web1">
+ <web>
+ <web-uri>web-app1.war</web-uri>
+ <context-root>/web1</context-root>
+ </web>
+ <alt-dd>WEB-INF/alt-web.xml</alt-dd>
+ </module>
+ <security-role id="security-role0">
+ <description>The 0 security role</description>
+ <role-name>role0</role-name>
+ </security-role>
+ <security-role id="security-role1">
+ <description>The 1 security role</description>
+ <role-name>role1</role-name>
+ </security-role>
+</application>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testAppXmlOnly.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,17 +1,17 @@
-<!DOCTYPE application PUBLIC
- "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
- "http://java.sun.com/dtd/application_1_3.dtd">
-
-<application>
- <display-name>The cts.jar with an application client jar</display-name>
- <description>1.3 EE Client</description>
- <module>
- <ejb>
- cts.jar
- </ejb>
- </module>
- <module>
- <java>app-client.jar</java>
- </module>
-</application>
+<!DOCTYPE application PUBLIC
+ "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
+ "http://java.sun.com/dtd/application_1_3.dtd">
+
+<application>
+ <display-name>The cts.jar with an application client jar</display-name>
+ <description>1.3 EE Client</description>
+ <module>
+ <ejb>
+ cts.jar
+ </ejb>
+ </module>
+ <module>
+ <java>app-client.jar</java>
+ </module>
+</application>
\ No newline at end of file
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup13.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testJBossSecurityRoles.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testJBossSecurityRoles.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testJBossSecurityRoles.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-app PUBLIC "-//JBoss//DTD J2EE Application 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd">
-
-<jboss-app>
- <security-domain>java:/jaas/cts</security-domain>
- <security-role>
- <role-name>Administrator</role-name>
- <principal-name>j2ee</principal-name>
- </security-role>
- <security-role>
- <role-name>Manager</role-name>
- <principal-name>javajoe</principal-name>
- </security-role>
- <security-role>
- <role-name>Employee</role-name>
- <principal-name>javajoe</principal-name>
- <principal-name>j2ee</principal-name>
- </security-role>
-</jboss-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-app PUBLIC "-//JBoss//DTD J2EE Application 4.2//EN" "http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd">
+
+<jboss-app>
+ <security-domain>java:/jaas/cts</security-domain>
+ <security-role>
+ <role-name>Administrator</role-name>
+ <principal-name>j2ee</principal-name>
+ </security-role>
+ <security-role>
+ <role-name>Manager</role-name>
+ <principal-name>javajoe</principal-name>
+ </security-role>
+ <security-role>
+ <role-name>Employee</role-name>
+ <principal-name>javajoe</principal-name>
+ <principal-name>j2ee</principal-name>
+ </security-role>
+</jboss-app>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testJBossSecurityRoles.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testNoDtd.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testNoDtd.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testNoDtd.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application>
- <display-name>JBossTest Web Container Testsuite</display-name>
-
- <module>
- <web>
- <web-uri>manifest-web.war</web-uri>
- <context-root>/manifest</context-root>
- </web>
- </module>
-
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application>
+ <display-name>JBossTest Web Container Testsuite</display-name>
+
+ <module>
+ <web>
+ <web-uri>manifest-web.war</web-uri>
+ <context-root>/manifest</context-root>
+ </web>
+ </module>
+
+</application>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testNoDtd.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>jsp_sec_secbasic</display-name>
- <module>
- <web>
- <web-uri>jsp_sec_secbasic_web.war</web-uri>
- <context-root>jsp_sec_secbasic_web</context-root>
- </web>
- </module>
- <security-role>
- <role-name>
- VP
- </role-name>
- </security-role>
- <security-role>
- <role-name>Employee</role-name>
- </security-role>
- <security-role>
- <role-name>Manager</role-name>
- </security-role>
- <security-role>
- <role-name>Administrator</role-name>
- </security-role>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+ <description>Application description</description>
+ <display-name>jsp_sec_secbasic</display-name>
+ <module>
+ <web>
+ <web-uri>jsp_sec_secbasic_web.war</web-uri>
+ <context-root>jsp_sec_secbasic_web</context-root>
+ </web>
+ </module>
+ <security-role>
+ <role-name>
+ VP
+ </role-name>
+ </security-role>
+ <security-role>
+ <role-name>Employee</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Manager</role-name>
+ </security-role>
+ <security-role>
+ <role-name>Administrator</role-name>
+ </security-role>
+</application>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testSecurityRoles.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion13.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion13.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion13.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE application PUBLIC
"-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
- "http://java.sun.com/dtd/application_1_3.dtd">
-<application id="application_1_3-id">
- <display-name>application_1_3-display-name</display-name>
- <module id="connector0">
- <connector>rar0.rar</connector>
- </module>
-</application>
+ "http://java.sun.com/dtd/application_1_3.dtd">
+<application id="application_1_3-id">
+ <display-name>application_1_3-display-name</display-name>
+ <module id="connector0">
+ <connector>rar0.rar</connector>
+ </module>
+</application>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion13.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion14.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion14.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion14.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
- version="1.4" id="application_1_4-id">
- <display-name>application_1_4-display-name</display-name>
- <module id="connector0">
- <connector>rar0.rar</connector>
- </module>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
+ version="1.4" id="application_1_4-id">
+ <display-name>application_1_4-display-name</display-name>
+ <module id="connector0">
+ <connector>rar0.rar</connector>
+ </module>
+</application>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testVersion14.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/application_5.xsd"
- version="5" id="application-test-everything">
-
- <description>en-ear-desc</description>
- <description xml:lang="fr">fr-ear-desc</description>
- <description xml:lang="de">de-ear-desc</description>
- <display-name>en-ear-disp</display-name>
- <display-name xml:lang="fr">fr-ear-disp</display-name>
- <display-name xml:lang="de">de-ear-disp</display-name>
- <icon id="en-ear-icon-id">
- <small-icon>en-ear-small-icon</small-icon>
- <large-icon>en-ear-large-icon</large-icon>
- </icon>
- <icon xml:lang="fr" id="fr-ear-icon-id">
- <small-icon>fr-ear-small-icon</small-icon>
- <large-icon>fr-ear-large-icon</large-icon>
- </icon>
- <icon xml:lang="de" id="de-ear-icon-id">
- <small-icon>de-ear-small-icon</small-icon>
- <large-icon>de-ear-large-icon</large-icon>
- </icon>
-
- <module id="connector0">
- <connector>rar0.rar</connector>
- <alt-dd>META-INF/alt-ra.xml</alt-dd>
- </module>
- <module id="java0">
- <java>client0.jar</java>
- <alt-dd>META-INF/alt-application-client.xml</alt-dd>
- </module>
- <module id="ejb0">
- <ejb>ejb-jar0.jar</ejb>
- <alt-dd>META-INF/alt-ejb-jar.xml</alt-dd>
- </module>
- <module id="ejb1">
- <ejb>ejb-jar1.jar</ejb>
- <alt-dd>META-INF/alt-ejb-jar.xml</alt-dd>
- </module>
- <module id="web0">
- <web>
- <web-uri>web-app0.war</web-uri>
- <context-root>/web0</context-root>
- </web>
- <alt-dd>WEB-INF/alt-web.xml</alt-dd>
- </module>
- <module id="web1">
- <web>
- <web-uri>web-app1.war</web-uri>
- <context-root>/web1</context-root>
- </web>
- <alt-dd>WEB-INF/alt-web.xml</alt-dd>
- </module>
- <security-role id="security-role0">
- <description>The 0 security role</description>
- <role-name>role0</role-name>
- </security-role>
- <security-role id="security-role1">
- <description>The 1 security role</description>
- <role-name>role1</role-name>
- </security-role>
- <library-directory>lib0</library-directory>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application_5.xsd"
+ version="5" id="application-test-everything">
+
+ <description>en-ear-desc</description>
+ <description xml:lang="fr">fr-ear-desc</description>
+ <description xml:lang="de">de-ear-desc</description>
+ <display-name>en-ear-disp</display-name>
+ <display-name xml:lang="fr">fr-ear-disp</display-name>
+ <display-name xml:lang="de">de-ear-disp</display-name>
+ <icon id="en-ear-icon-id">
+ <small-icon>en-ear-small-icon</small-icon>
+ <large-icon>en-ear-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-ear-icon-id">
+ <small-icon>fr-ear-small-icon</small-icon>
+ <large-icon>fr-ear-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-ear-icon-id">
+ <small-icon>de-ear-small-icon</small-icon>
+ <large-icon>de-ear-large-icon</large-icon>
+ </icon>
+
+ <module id="connector0">
+ <connector>rar0.rar</connector>
+ <alt-dd>META-INF/alt-ra.xml</alt-dd>
+ </module>
+ <module id="java0">
+ <java>client0.jar</java>
+ <alt-dd>META-INF/alt-application-client.xml</alt-dd>
+ </module>
+ <module id="ejb0">
+ <ejb>ejb-jar0.jar</ejb>
+ <alt-dd>META-INF/alt-ejb-jar.xml</alt-dd>
+ </module>
+ <module id="ejb1">
+ <ejb>ejb-jar1.jar</ejb>
+ <alt-dd>META-INF/alt-ejb-jar.xml</alt-dd>
+ </module>
+ <module id="web0">
+ <web>
+ <web-uri>web-app0.war</web-uri>
+ <context-root>/web0</context-root>
+ </web>
+ <alt-dd>WEB-INF/alt-web.xml</alt-dd>
+ </module>
+ <module id="web1">
+ <web>
+ <web-uri>web-app1.war</web-uri>
+ <context-root>/web1</context-root>
+ </web>
+ <alt-dd>WEB-INF/alt-web.xml</alt-dd>
+ </module>
+ <security-role id="security-role0">
+ <description>The 0 security role</description>
+ <role-name>role0</role-name>
+ </security-role>
+ <security-role id="security-role1">
+ <description>The 1 security role</description>
+ <role-name>role1</role-name>
+ </security-role>
+ <library-directory>lib0</library-directory>
+</application>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5xEverything_testEverything.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testDescriptionGroup.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testId.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testId.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testId.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/application_5.xsd"
- version="5" id="application-test-id">
-
- <description>en-ear-desc</description>
- <description xml:lang="fr">fr-ear-desc</description>
- <description xml:lang="de">de-ear-desc</description>
- <display-name>en-ear-disp</display-name>
- <display-name xml:lang="fr">fr-ear-disp</display-name>
- <display-name xml:lang="de">de-ear-disp</display-name>
- <icon id="en-ear-icon-id">
- <small-icon>en-ear-small-icon</small-icon>
- <large-icon>en-ear-large-icon</large-icon>
- </icon>
- <icon xml:lang="fr" id="fr-ear-icon-id">
- <small-icon>fr-ear-small-icon</small-icon>
- <large-icon>fr-ear-large-icon</large-icon>
- </icon>
- <icon xml:lang="de" id="de-ear-icon-id">
- <small-icon>de-ear-small-icon</small-icon>
- <large-icon>de-ear-large-icon</large-icon>
- </icon>
-
- <module id="connector0">
- <connector>rar0.rar</connector>
- </module>
- <module id="java0">
- <java>client0.jar</java>
- </module>
- <module id="ejb0">
- <ejb>ejb-jar0.jar</ejb>
- </module>
- <module id="ejb1">
- <ejb>ejb-jar1.jar</ejb>
- </module>
- <module id="web0">
- <web>
- <web-uri>web-app0.war</web-uri>
- <context-root>/web0</context-root>
- </web>
- </module>
- <module id="web1">
- <web>
- <web-uri>web-app1.war</web-uri>
- <context-root>/web1</context-root>
- </web>
- </module>
- <security-role id="security-role0">
- <role-name>role0</role-name>
- </security-role>
- <security-role id="security-role1">
- <role-name>role1</role-name>
- </security-role>
- <library-directory id="library-directory0">lib0</library-directory>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application_5.xsd"
+ version="5" id="application-test-id">
+
+ <description>en-ear-desc</description>
+ <description xml:lang="fr">fr-ear-desc</description>
+ <description xml:lang="de">de-ear-desc</description>
+ <display-name>en-ear-disp</display-name>
+ <display-name xml:lang="fr">fr-ear-disp</display-name>
+ <display-name xml:lang="de">de-ear-disp</display-name>
+ <icon id="en-ear-icon-id">
+ <small-icon>en-ear-small-icon</small-icon>
+ <large-icon>en-ear-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="fr" id="fr-ear-icon-id">
+ <small-icon>fr-ear-small-icon</small-icon>
+ <large-icon>fr-ear-large-icon</large-icon>
+ </icon>
+ <icon xml:lang="de" id="de-ear-icon-id">
+ <small-icon>de-ear-small-icon</small-icon>
+ <large-icon>de-ear-large-icon</large-icon>
+ </icon>
+
+ <module id="connector0">
+ <connector>rar0.rar</connector>
+ </module>
+ <module id="java0">
+ <java>client0.jar</java>
+ </module>
+ <module id="ejb0">
+ <ejb>ejb-jar0.jar</ejb>
+ </module>
+ <module id="ejb1">
+ <ejb>ejb-jar1.jar</ejb>
+ </module>
+ <module id="web0">
+ <web>
+ <web-uri>web-app0.war</web-uri>
+ <context-root>/web0</context-root>
+ </web>
+ </module>
+ <module id="web1">
+ <web>
+ <web-uri>web-app1.war</web-uri>
+ <context-root>/web1</context-root>
+ </web>
+ </module>
+ <security-role id="security-role0">
+ <role-name>role0</role-name>
+ </security-role>
+ <security-role id="security-role1">
+ <role-name>role1</role-name>
+ </security-role>
+ <library-directory id="library-directory0">lib0</library-directory>
+</application>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testId.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testVersion.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testVersion.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testVersion.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/application_5.xsd"
- version="5" id="application-testVersion">
-
- <module id="connector0">
- <connector>rar0.rar</connector>
- </module>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application_5.xsd"
+ version="5" id="application-testVersion">
+
+ <module id="connector0">
+ <connector>rar0.rar</connector>
+ </module>
+</application>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testVersion.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd">
- <description>Application Archive</description>
- <display-name>transport_vehicles</display-name>
-
-
- <module>
- <java>
- transport_ejb_vehicle_client.jar
- </java>
- </module>
-
-
- <module>
- <ejb>
- transport_ejb_vehicle_ejb.jar
- </ejb>
- </module>
-
-
- <module>
- <web>
- <web-uri>transport_jsp_vehicle_web.war</web-uri>
- <context-root>transport_jsp_vehicle</context-root>
- </web>
- </module>
-
-
- <module>
- <web>
- <web-uri>transport_servlet_vehicle_web.war</web-uri>
- <context-root>
- transport_servlet_vehicle
- </context-root>
- </web>
- </module>
-
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ version="5"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd">
+ <description>Application Archive</description>
+ <display-name>transport_vehicles</display-name>
+
+
+ <module>
+ <java>
+ transport_ejb_vehicle_client.jar
+ </java>
+ </module>
+
+
+ <module>
+ <ejb>
+ transport_ejb_vehicle_ejb.jar
+ </ejb>
+ </module>
+
+
+ <module>
+ <web>
+ <web-uri>transport_jsp_vehicle_web.war</web-uri>
+ <context-root>transport_jsp_vehicle</context-root>
+ </web>
+ </module>
+
+
+ <module>
+ <web>
+ <web-uri>transport_servlet_vehicle_web.war</web-uri>
+ <context-root>
+ transport_servlet_vehicle
+ </context-root>
+ </web>
+ </module>
+
+</application>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testWhitespace.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-app xmlns="http://www.jboss.com/xml/ns/javaee"
- xmlns:jee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/noschema/jboss-app_5_0.xsd"
- version="5.0"
- id="jboss-app-id">
-
-<!-- this schema does not exist xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-app_5_0.xsd" -->
-<!-- http://www.jboss.org/noschema is used to fool the validation -->
-<!-- see JBMETA-190 -->
-
- <library-directory>jboss-app-lib0</library-directory>
-
- <!-- Add a sar0 module -->
- <module id="sar0">
- <service>sar0.sar</service>
- </module>
- <!-- Override the web1 context-root -->
- <module id="web1">
- <web>
- <web-uri>web-app1.war</web-uri>
- <context-root>/web1-override</context-root>
- </web>
- </module>
- <!-- Add a web2 module -->
- <module id="web2">
- <web>
- <web-uri>web-app2.war</web-uri>
- <context-root>/web2</context-root>
- </web>
- </module>
- <module id="har0">
- <har>har0.har</har>
- </module>
- <security-role id="security-role0">
- <description>The 0 security role</description>
- <role-name>role0</role-name>
- <principal-name>principal0</principal-name>
- </security-role>
- <security-role id="security-role1">
- <description>The 1 security role</description>
- <role-name>role1</role-name>
- <principal-name>principal1</principal-name>
- </security-role>
-</jboss-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-app xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:jee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/noschema/jboss-app_5_0.xsd"
+ version="5.0"
+ id="jboss-app-id">
+
+<!-- this schema does not exist xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-app_5_0.xsd" -->
+<!-- http://www.jboss.org/noschema is used to fool the validation -->
+<!-- see JBMETA-190 -->
+
+ <library-directory>jboss-app-lib0</library-directory>
+
+ <!-- Add a sar0 module -->
+ <module id="sar0">
+ <service>sar0.sar</service>
+ </module>
+ <!-- Override the web1 context-root -->
+ <module id="web1">
+ <web>
+ <web-uri>web-app1.war</web-uri>
+ <context-root>/web1-override</context-root>
+ </web>
+ </module>
+ <!-- Add a web2 module -->
+ <module id="web2">
+ <web>
+ <web-uri>web-app2.war</web-uri>
+ <context-root>/web2</context-root>
+ </web>
+ </module>
+ <module id="har0">
+ <har>har0.har</har>
+ </module>
+ <security-role id="security-role0">
+ <description>The 0 security role</description>
+ <role-name>role0</role-name>
+ <principal-name>principal0</principal-name>
+ </security-role>
+ <security-role id="security-role1">
+ <description>The 1 security role</description>
+ <role-name>role1</role-name>
+ <principal-name>principal1</principal-name>
+ </security-role>
+</jboss-app>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5xEverything_testEverything.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testModuleOrder.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testModuleOrder.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testModuleOrder.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-app
- PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
-
-<jboss-app>
- <module-order>strict</module-order>
-</jboss-app>
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
+
+<jboss-app>
+ <module-order>strict</module-order>
+</jboss-app>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testModuleOrder.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion40.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion40.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion40.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-app
- PUBLIC "-//JBoss//DTD Java EE Application 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
-<jboss-app>
-
- <module id="sar0">
- <service>sar0.sar</service>
- </module>
-</jboss-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD Java EE Application 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
+<jboss-app>
+
+ <module id="sar0">
+ <service>sar0.sar</service>
+ </module>
+</jboss-app>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion40.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion42.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion42.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion42.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-app
- PUBLIC "-//JBoss//DTD Java EE Application 4.2//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd">
-<jboss-app>
-
- <module id="sar0">
- <service>sar0.sar</service>
- </module>
-</jboss-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD Java EE Application 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_4_2.dtd">
+<jboss-app>
+
+ <module id="sar0">
+ <service>sar0.sar</service>
+ </module>
+</jboss-app>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion42.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.xml 2010-02-10 22:21:24 UTC (rev 100825)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.xml 2010-02-10 22:28:33 UTC (rev 100826)
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-app xmlns="http://www.jboss.com/xml/ns/javaee"
- xmlns:jee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/noschema/jboss-app_5_0.xsd"
- version="5.0"
- id="jboss-app_5_0-id">
-
-<!-- this schema does not exist xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-app_5_0.xsd" -->
-<!-- http://www.jboss.org/noschema is used to fool the validation -->
-<!-- see JBMETA-190 -->
-
-
- <library-directory>jboss-app-lib0</library-directory>
- <module id="sar0">
- <service>sar0.sar</service>
- </module>
- <module id="web2">
- <web>
- <web-uri>web-app1.war</web-uri>
- <context-root>/web1</context-root>
- </web>
- </module>
- <security-role id="security-role0">
- <description>The 0 security role</description>
- <role-name>role0</role-name>
- </security-role>
- <security-role id="security-role1">
- <description>The 1 security role</description>
- <role-name>role1</role-name>
- </security-role>
-</jboss-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-app xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:jee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/noschema/jboss-app_5_0.xsd"
+ version="5.0"
+ id="jboss-app_5_0-id">
+
+<!-- this schema does not exist xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-app_5_0.xsd" -->
+<!-- http://www.jboss.org/noschema is used to fool the validation -->
+<!-- see JBMETA-190 -->
+
+
+ <library-directory>jboss-app-lib0</library-directory>
+ <module id="sar0">
+ <service>sar0.sar</service>
+ </module>
+ <module id="web2">
+ <web>
+ <web-uri>web-app1.war</web-uri>
+ <context-root>/web1</context-root>
+ </web>
+ </module>
+ <security-role id="security-role0">
+ <description>The 0 security role</description>
+ <role-name>role0</role-name>
+ </security-role>
+ <security-role id="security-role1">
+ <description>The 1 security role</description>
+ <role-name>role1</role-name>
+ </security-role>
+</jboss-app>
Property changes on: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/JBossApp5x_testVersion50.xml
___________________________________________________________________
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list