Mailing-List: contact flex-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: flex-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1408861 - in
 /incubator/flex/utilities/trunk/mavenizer/src/main:
 java/flex/FlexFrameworkGenerator.java resources/
Date: Tue, 13 Nov 2012 17:59:24 -0000
To: flex-commits@incubator.apache.org
From: erikdebruin@apache.org
Message-Id: <20121113175924.7B76223888EA@eris.apache.org>

Author: erikdebruin
Date: Tue Nov 13 17:59:23 2012
New Revision: 1408861

URL: http://svn.apache.org/viewvc?rev=1408861&view=rev
Log:
Christofer Dutz: I think this will resolve the discussion about binary files and files without Apache headers.

Removed:
    incubator/flex/utilities/trunk/mavenizer/src/main/resources/
Modified:
    incubator/flex/utilities/trunk/mavenizer/src/main/java/flex/FlexFrameworkGenerator.java

Modified: incubator/flex/utilities/trunk/mavenizer/src/main/java/flex/FlexFrameworkGenerator.java
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/mavenizer/src/main/java/flex/FlexFrameworkGenerator.java?rev=1408861&r1=1408860&r2=1408861&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/mavenizer/src/main/java/flex/FlexFrameworkGenerator.java (original)
+++ incubator/flex/utilities/trunk/mavenizer/src/main/java/flex/FlexFrameworkGenerator.java Tue Nov 13 17:59:23 2012
@@ -1,19 +1,19 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package flex;
 
 import java.io.*;
@@ -572,19 +572,8 @@ public class FlexFrameworkGenerator exte
     }
 
     protected void writeDummyResourceBundleSwc(final File targetFile) throws Exception {
-        final InputStream dummyFile = FlexFrameworkGenerator.class.getResourceAsStream("/dummy.rb.swc");
-        if (dummyFile != null) {
-            final OutputStream out = new FileOutputStream(targetFile);
-            byte buf[] = new byte[1024];
-            int len;
-            while ((len = dummyFile.read(buf)) > 0) {
-                out.write(buf, 0, len);
-            }
-            out.close();
-            dummyFile.close();
-        } else {
-            throw new Exception("Could not load dummy resource file.");
-        }
+		final ZipOutputStream out = new ZipOutputStream(new FileOutputStream(targetFile));
+		out.close();
     }
 
     private void generateThemeArtifacts(File themesDirectory, File targetDirectory, String sdkVersion, boolean isApache)
@@ -610,7 +599,7 @@ public class FlexFrameworkGenerator exte
 
                     // Copy the SWC.
                     File targetSwcFile = new File(targetThemeVersionDirectory, themeName + "-" +
-                            themeVersion + "-theme.swc");
+                            themeVersion + ".swc");
 
                     if(themeFile.exists()) {
                         if(!targetThemeVersionDirectory.mkdirs()) {
@@ -630,7 +619,6 @@ public class FlexFrameworkGenerator exte
                         themeMetadata.setArtifactId(themeName);
                         themeMetadata.setVersion(themeVersion);
                         themeMetadata.setPackaging("swc");
-                        themeMetadata.setClassifier("theme");
                         generateSwcPom(targetSwcFile, themeMetadata);
                     }
                 }