Permalink
Browse files

Merge remote-tracking branch 'upstream/flexmojos-4.x' into flexmojos-4.x

  • Loading branch information...
2 parents 50d9997 + 3253883 commit 2fb7a092cd262af01740a584f218fed5698b27cc unknown committed Jun 29, 2011
View
11 ...ojos-flex-compiler/src/main/java/org/sonatype/flexmojos/compiler/DefaultFlexCompiler.java
@@ -74,9 +74,16 @@ public void command()
String defaultTransfomer = System.getProperty( "javax.xml.transform.TransformerFactory" );
System.setProperty( "javax.xml.transform.TransformerFactory",
"org.apache.xalan.processor.TransformerFactoryImpl" );
- ASDoc.main( args );
+ ASDoc.asdoc( args );
// and set it back to the default
- System.setProperty( "javax.xml.transform.TransformerFactory", defaultTransfomer );
+ if ( defaultTransfomer == null )
+ {
+ System.getProperties().remove( "javax.xml.transform.TransformerFactory" );
+ }
+ else
+ {
+ System.setProperty( "javax.xml.transform.TransformerFactory", defaultTransfomer );
+ }
}
}, sychronize );
}
View
2 ...ojos-test-harness/src/test/java/org/sonatype/flexmojos/tests/issues/Flexmojos130Test.java
@@ -18,7 +18,7 @@ public void attachAsdoc()
throws Exception
{
File testDir = getProject( "/issues/flexmojos-130" );
- test( testDir, "install" );
+ test( testDir, "install" ).verifyErrorFreeLog();
File swc = new File( testDir, "target/flexmojos-130-1.0-SNAPSHOT.swc" );
assertThat( swc, FileMatcher.exists() );
View
2 pom.xml
@@ -49,7 +49,7 @@
<properties>
<commons_io.version>1.4</commons_io.version>
- <flex.sdk.version>4.5.0.20967</flex.sdk.version>
+ <flex.sdk.version>4.5.1.21328</flex.sdk.version>
<maven.version>3.0.3</maven.version>
<maven-site-plugin.version>3.0-beta-3</maven-site-plugin.version>
<sisu.version>2.1.1</sisu.version>

0 comments on commit 2fb7a09

Please sign in to comment.