Author: snicoll
Date: Sat Apr 25 03:48:41 2009
New Revision: 768467
URL: http://svn.apache.org/viewvc?rev=768467&view=rev
Log:
MEAR-105: Fixed jboss-app.xml settings for JBoss5
Submitted by: Evgeny Mandrikov
Reviewed by: Stephane Nicoll
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-053/expected-META-INF/jboss-app.xml
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-053/pom.xml
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java?rev=768467&r1=768466&r2=768467&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossAppXmlWriter.java
Sat Apr 25 03:48:41 2009
@@ -81,19 +81,19 @@
writer.startElement( JBOSS_APP_ELEMENT );
// If JBoss 4.2 or 5.0, write the JBoss 4.2 and JBoss 5.0-compatible
stuff
- if ( jbossConfiguration.isJbossFourDotTwo() ||
jbossConfiguration.isJbossFive() )
+ if ( jbossConfiguration.isJbossFourDotTwoOrHigher() )
{
// library-directory
if ( jbossConfiguration.getLibraryDirectory() != null )
{
writer.startElement( JbossConfiguration.LIBRARY_DIRECTORY );
- writer.writeText ( jbossConfiguration.getLibraryDirectory() );
+ writer.writeText( jbossConfiguration.getLibraryDirectory() );
writer.endElement();
}
}
- // If JBoss 4.2, write the jboss4.2 specific stuff
- if ( jbossConfiguration.isJbossFourDotTwo() )
+ // If JBoss 4.2+, write the jboss4.2+ specific stuff
+ if ( jbossConfiguration.isJbossFourDotTwoOrHigher() )
{
// module-order (only available in 4.2 and 4.3)
if ( jbossConfiguration.getModuleOrder() != null )
@@ -105,7 +105,7 @@
}
// If JBoss 4, write the jboss4 specific stuff
- if ( jbossConfiguration.isJbossFour() ||
jbossConfiguration.isJbossFourDotTwo() )
+ if ( jbossConfiguration.isJbossFourOrHigher() )
{
if ( jbossConfiguration.getSecurityDomain() != null )
{
@@ -122,12 +122,13 @@
}
// classloader repository
- if ( jbossConfiguration.getLoaderRepository() != null ||
jbossConfiguration.getLoaderRepositoryConfig() != null)
+ if ( jbossConfiguration.getLoaderRepository() != null ||
+ jbossConfiguration.getLoaderRepositoryConfig() != null )
{
writer.startElement( JbossConfiguration.LOADER_REPOSITORY );
// classloader repository class
- if ( jbossConfiguration.getLoaderRepositoryClass() != null)
+ if ( jbossConfiguration.getLoaderRepositoryClass() != null )
{
writer.addAttribute(
JbossConfiguration.LOADER_REPOSITORY_CLASS_ATTRIBUTE,
jbossConfiguration.getLoaderRepositoryClass() );
@@ -145,7 +146,7 @@
writer.startElement(
JbossConfiguration.LOADER_REPOSITORY_CONFIG );
// classloader configuration parser
- if ( jbossConfiguration.getConfigParserClass() != null)
+ if ( jbossConfiguration.getConfigParserClass() != null )
{
writer.addAttribute(
JbossConfiguration.CONFIG_PARSER_CLASS_ATTRIBUTE,
jbossConfiguration.getConfigParserClass() );
@@ -153,7 +154,7 @@
writer.writeText(
jbossConfiguration.getLoaderRepositoryConfig() );
writer.endElement();
}
-
+
writer.endElement();
}
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java?rev=768467&r1=768466&r2=768467&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JbossConfiguration.java
Sat Apr 25 03:48:41 2009
@@ -169,6 +169,17 @@
return jbossFour;
}
+ /**
+ * Returns true if the targeted JBoss version if 4 or higher (that is
+ * 4, 4.2 or 5).
+ *
+ * @return true if the targeted version is 4+
+ */
+ public boolean isJbossFourOrHigher()
+ {
+ return jbossFour || jbossFourDotTwo || jbossFive;
+ }
+
/**
* Returns true if the targeted JBoss version is 4.2.
@@ -181,6 +192,18 @@
}
/**
+ * Returns true if the targeted JBoss version if 4.2 or higher (that is
+ * 4.2 or 5).
+ *
+ * @return true if the targeted version is 4.2+
+ */
+ public boolean isJbossFourDotTwoOrHigher()
+ {
+ return jbossFourDotTwo || jbossFive;
+ }
+
+
+ /**
* Returns true if the targeted JBoss version is 5.
*
* @return if the targeted version is 5
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-053/expected-META-INF/jboss-app.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-053/expected-META-INF/jboss-app.xml?rev=768467&r1=768466&r2=768467&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-053/expected-META-INF/jboss-app.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-053/expected-META-INF/jboss-app.xml
Sat Apr 25 03:48:41 2009
@@ -22,7 +22,10 @@
"-//JBoss//DTD Java EE Application 5.0//EN"
"http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd";>
<jboss-app>
+ <module-order>strict</module-order>
+ <security-domain>java:/jaas/test</security-domain>
+ <unauthenticated-principal>guest</unauthenticated-principal>
<loader-repository>
<loader-repository-config>abc</loader-repository-config>
</loader-repository>
-</jboss-app>
\ No newline at end of file
+</jboss-app>
Modified:
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-053/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-053/pom.xml?rev=768467&r1=768466&r2=768467&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-053/pom.xml
(original)
+++
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-053/pom.xml
Sat Apr 25 03:48:41 2009
@@ -50,6 +50,9 @@
<jboss>
<version>5</version>
<loader-repository-config>abc</loader-repository-config>
+ <module-order>strict</module-order>
+ <security-domain>java:/jaas/test</security-domain>
+ <unauthenticated-principal>guest</unauthenticated-principal>
</jboss>
</configuration>
</plugin>
