You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/03/27 18:08:35 UTC
svn commit: r641899 - in /maven/sandbox/trunk/plugins/maven-android: ./
maven-android-core/src/main/java/org/apache/maven/android/
maven-dx-plugin/src/main/resources/META-INF/plexus/ maven-par-plugin/
maven-par-plugin/src/ maven-par-plugin/src/main/ ma...
Author: sisbell
Date: Thu Mar 27 10:08:22 2008
New Revision: 641899
URL: http://svn.apache.org/viewvc?rev=641899&view=rev
Log:
Add packager for provisioning android apps.
Added:
maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/
maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/pom.xml
- copied, changed from r611054, maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/pom.xml
maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/
maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/
maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/
maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/
maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/
maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/
maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/
maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/
maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParPackagerMojo.java (contents, props changed)
- copied, changed from r596039, maven/sandbox/trunk/plugins/maven-android/maven-adb-plugin/src/main/java/org/apache/maven/plugin/adb/DevicePullerMojo.java
maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParResourceMojo.java
Modified:
maven/sandbox/trunk/plugins/maven-android/maven-android-core/src/main/java/org/apache/maven/android/CommandExecutor.java
maven/sandbox/trunk/plugins/maven-android/maven-android.iml
maven/sandbox/trunk/plugins/maven-android/maven-android.ipr
maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/resources/META-INF/plexus/components.xml
maven/sandbox/trunk/plugins/maven-android/pom.xml
Modified: maven/sandbox/trunk/plugins/maven-android/maven-android-core/src/main/java/org/apache/maven/android/CommandExecutor.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-android-core/src/main/java/org/apache/maven/android/CommandExecutor.java?rev=641899&r1=641898&r2=641899&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/maven-android-core/src/main/java/org/apache/maven/android/CommandExecutor.java (original)
+++ maven/sandbox/trunk/plugins/maven-android/maven-android-core/src/main/java/org/apache/maven/android/CommandExecutor.java Thu Mar 27 10:08:22 2008
@@ -181,24 +181,24 @@
result = CommandLineUtils.executeCommandLine( commandline, stdOut, stdErr );
if ( logger != null )
{
- logger.debug( "NMAVEN-040-000: Executed command: Commandline = " + commandline +
+ logger.debug( "ANDROID-040-000: Executed command: Commandline = " + commandline +
", Result = " + result );
}
else
{
- System.out.println( "NMAVEN-040-000: Executed command: Commandline = " + commandline +
+ System.out.println( "ANDROID-040-000: Executed command: Commandline = " + commandline +
", Result = " + result );
}
if ( ( failsOnErrorOutput && stdErr.hasError() ) || result != 0 )
{
- throw new ExecutionException( "NMAVEN-040-001: Could not execute: Command = " +
+ throw new ExecutionException( "ANDROID-040-001: Could not execute: Command = " +
commandline.toString() + ", Result = " + result );
}
}
catch ( CommandLineException e )
{
throw new ExecutionException(
- "NMAVEN-040-002: Could not execute: Command = " + commandline.toString() );
+ "ANDROID-040-002: Could not execute: Command = " + commandline.toString() );
}
}
@@ -240,7 +240,7 @@
{
if ( logger == null )
{
- System.out.println( "NMAVEN-040-003: Error Log not set: Will not output error logs" );
+ System.out.println( "ANDROID-040-003: Error Log not set: Will not output error logs" );
}
error = false;
}
Modified: maven/sandbox/trunk/plugins/maven-android/maven-android.iml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-android.iml?rev=641899&r1=641898&r2=641899&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/maven-android.iml (original)
+++ maven/sandbox/trunk/plugins/maven-android/maven-android.iml Thu Mar 27 10:08:22 2008
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager">
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
@@ -12,8 +11,9 @@
<sourceFolder url="file://$MODULE_DIR$/maven-android-core/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/maven-dx-plugin/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/maven-location-plugin/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/maven-par-plugin/src/main/java" isTestSource="false" />
</content>
- <orderEntry type="inheritedJdk" />
+ <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
@@ -64,6 +64,24 @@
<library>
<CLASSES>
<root url="jar://$localRepository$/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$localRepository$/org/codehaus/plexus/plexus-archiver/1.0-alpha-9/plexus-archiver-1.0-alpha-9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: maven/sandbox/trunk/plugins/maven-android/maven-android.ipr
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-android.ipr?rev=641899&r1=641898&r2=641899&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/maven-android.ipr (original)
+++ maven/sandbox/trunk/plugins/maven-android/maven-android.ipr Thu Mar 27 10:08:22 2008
@@ -1,15 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
+<project relativePaths="false" version="4">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
</component>
+ <component name="BuildJarProjectSettings">
+ <option name="BUILD_JARS_ON_MAKE" value="false" />
+ </component>
+ <component name="CodeStyleProjectProfileManger">
+ <option name="PROJECT_PROFILE" />
+ <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+ </component>
<component name="CodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS" />
<option name="USE_PER_PROJECT_SETTINGS" value="false" />
</component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
- <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
<option name="DEPLOY_AFTER_MAKE" value="0" />
<resourceExtensions>
<entry name=".+\.(properties|xml|html|dtd|tld)" />
@@ -27,20 +33,47 @@
<entry name="?*.tld" />
</wildcardResourcePatterns>
</component>
- <component name="DataSourceManagerImpl" />
<component name="DependenciesAnalyzeManager">
<option name="myForwardDirection" value="false" />
</component>
- <component name="DependencyValidationManager" />
+ <component name="DependencyValidationManager">
+ <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+ </component>
+ <component name="EclipseCompilerSettings">
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="true" />
+ <option name="DEPRECATION" value="false" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ <option name="MAXIMUM_HEAP_SIZE" value="128" />
+ </component>
+ <component name="EclipseEmbeddedCompilerSettings">
+ <option name="DEBUGGING_INFO" value="true" />
+ <option name="GENERATE_NO_WARNINGS" value="true" />
+ <option name="DEPRECATION" value="false" />
+ <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+ <option name="MAXIMUM_HEAP_SIZE" value="128" />
+ </component>
<component name="EntryPointsManager">
- <entry_points />
+ <entry_points version="2.0" />
</component>
<component name="ExportToHTMLSettings">
<option name="PRINT_LINE_NUMBERS" value="false" />
<option name="OPEN_IN_BROWSER" value="false" />
<option name="OUTPUT_DIRECTORY" />
</component>
- <component name="GUI Designer component loader factory" />
+ <component name="IdProvider" IDEtalkID="9F2FDB83379FAC807629C3AB2703D750" />
+ <component name="InspectionProjectProfileManager">
+ <option name="PROJECT_PROFILE" value="Project Default" />
+ <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+ <scopes />
+ <profiles>
+ <profile version="1.0" is_locked="false">
+ <option name="myName" value="Project Default" />
+ <option name="myLocal" value="false" />
+ </profile>
+ </profiles>
+ <list size="0" />
+ </component>
<component name="JavacSettings">
<option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="false" />
@@ -62,6 +95,7 @@
<option name="OPTION_DEPRECATED_LIST" value="true" />
<option name="OTHER_OPTIONS" value="" />
<option name="HEAP_SIZE" />
+ <option name="LOCALE" />
<option name="OPEN_IN_BROWSER" value="true" />
</component>
<component name="JikesSettings">
@@ -103,114 +137,139 @@
</component>
<component name="Palette2">
<group name="Swing">
- <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
- <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false">
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
- <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false">
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
- <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false">
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
- <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false">
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
- <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false">
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
- <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false">
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
- <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false">
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
- <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false">
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false">
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false">
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
- <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false">
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false">
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false">
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false">
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
- <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false">
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false">
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false">
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
- <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false">
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
- <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false">
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
- <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false">
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
- <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false">
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
</group>
</component>
+ <component name="ProjectFileVersion" converted="true" />
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/maven-android.iml" filepath="$PROJECT_DIR$/maven-android.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" />
+ <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK" />
+ <component name="ResourceManagerContainer">
+ <option name="myResourceBundles">
+ <value>
+ <list size="0" />
+ </value>
+ </option>
+ </component>
<component name="RmicSettings">
<option name="IS_EANABLED" value="false" />
<option name="DEBUGGING_INFO" value="true" />
@@ -218,7 +277,10 @@
<option name="GENERATE_IIOP_STUBS" value="false" />
<option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
- <component name="libraryTable" />
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="svn" />
+ </component>
+ <component name="WebServicesPlugin" addRequiredLibraries="true" />
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
<option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
Modified: maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/resources/META-INF/plexus/components.xml?rev=641899&r1=641898&r2=641899&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/resources/META-INF/plexus/components.xml Thu Mar 27 10:08:22 2008
@@ -34,6 +34,21 @@
</configuration>
</component>
<component>
+ <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+ <role-hint>android:par</role-hint>
+ <implementation>
+ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+ </implementation>
+ <configuration>
+ <phases>
+ <process-resources>org.apache.maven.plugins:maven-par-plugin:resources</process-resources>
+ <package>
+ org.apache.maven.plugins:maven-par-plugin:package
+ </package>
+ </phases>
+ </configuration>
+ </component>
+ <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>android:dex</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
@@ -49,6 +64,15 @@
<configuration>
<extension>apk</extension>
<type>android:apk</type>
+ </configuration>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+ <role-hint>android:par</role-hint>
+ <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+ <configuration>
+ <extension>par</extension>
+ <type>android:par</type>
</configuration>
</component>
</components>
Copied: maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/pom.xml (from r611054, maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/pom.xml)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/pom.xml?p2=maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/pom.xml&p1=maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/pom.xml&r1=611054&r2=641899&rev=641899&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/pom.xml Thu Mar 27 10:08:22 2008
@@ -20,28 +20,48 @@
-->
<project 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">
- <parent>
- <groupId>org.apache.maven.android</groupId>
- <artifactId>maven-android-project</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dx-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
- <name>maven-dx-plugin</name>
- <description>Maven Plugin for Android DX</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.android</groupId>
- <artifactId>maven-android-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>2.0.8</version>
- </dependency>
- </dependencies>
+ <parent>
+ <groupId>org.apache.maven.android</groupId>
+ <artifactId>maven-android-project</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-par-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
+ <name>maven-par-plugin</name>
+ <description>Maven Plugin for Provisioning Packager</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>1.0-alpha-10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ </dependencies>
</project>
Copied: maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParPackagerMojo.java (from r596039, maven/sandbox/trunk/plugins/maven-android/maven-adb-plugin/src/main/java/org/apache/maven/plugin/adb/DevicePullerMojo.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParPackagerMojo.java?p2=maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParPackagerMojo.java&p1=maven/sandbox/trunk/plugins/maven-android/maven-adb-plugin/src/main/java/org/apache/maven/plugin/adb/DevicePullerMojo.java&r1=596039&r2=641899&rev=641899&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/maven-adb-plugin/src/main/java/org/apache/maven/plugin/adb/DevicePullerMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParPackagerMojo.java Thu Mar 27 10:08:22 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.adb;
+package org.apache.maven.plugin.par;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,46 +21,56 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.android.CommandExecutor;
-import org.apache.maven.android.ExecutionException;
+import org.apache.maven.project.MavenProject;
-import java.io.File;
+import java.io.*;
import java.util.List;
-import java.util.ArrayList;
+import java.util.Collections;
+import java.util.zip.ZipOutputStream;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipEntry;
+
+import org.codehaus.plexus.archiver.zip.ZipArchiver;
+import org.codehaus.plexus.archiver.ArchiverException;
/**
* @author Shane Isbell
- * @goal pull
- * @requiresProject false
+ * @goal package
+ * @requiresProject true
+ * @requiresDependencyResolution runtime
* @description
*/
-public class DevicePullerMojo extends AbstractMojo {
+public class ParPackagerMojo extends AbstractMojo {
/**
- * @parameter expression="${source}"
+ * The maven project.
+ *
+ * @parameter expression="${project}"
* @required
+ * @readonly
*/
- private File sourceFileOrDirectory;
+ private MavenProject project;
/**
- * @parameter expression="${destination}"
+ * Input directory
+ *
+ * @parameter expression = "${inputDirectory}" default-value="${project.build.directory}/par-archive"
* @required
*/
- private File destinationFileOrDirectory;
+ private File inputDir;
public void execute() throws MojoExecutionException, MojoFailureException {
- CommandExecutor executor = CommandExecutor.Factory.createDefaultCommmandExecutor();
- executor.setLogger(this.getLog());
-
- List<String> commands = new ArrayList<String>();
- commands.add("pull");
- commands.add(sourceFileOrDirectory.getAbsolutePath());
- commands.add(destinationFileOrDirectory.getAbsolutePath());
+ ZipArchiver archiver = new ZipArchiver();
+ archiver.setForced(true);
+ archiver.setDestFile(new File(project.getBuild().getDirectory(), project.getBuild().getFinalName() + ".par"));
- getLog().info("adb " + commands.toString());
try {
- executor.executeCommand("adb", commands);
- } catch (ExecutionException e) {
+ archiver.addDirectory(inputDir);
+ archiver.createArchive();
+ } catch (ArchiverException e) {
+ throw new MojoExecutionException("", e);
+ } catch (IOException e) {
+ throw new MojoExecutionException("", e);
}
}
-}
+}
\ No newline at end of file
Propchange: maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParPackagerMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParResourceMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParResourceMojo.java?rev=641899&view=auto
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParResourceMojo.java (added)
+++ maven/sandbox/trunk/plugins/maven-android/maven-par-plugin/src/main/java/org/apache/maven/plugin/par/ParResourceMojo.java Thu Mar 27 10:08:22 2008
@@ -0,0 +1,120 @@
+package org.apache.maven.plugin.par;
+
+import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.artifact.Artifact;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Shane Isbell
+ * @goal resources
+ * @requiresProject true
+ * @requiresDependencyResolution runtime
+ * @description
+ */
+public class ParResourceMojo extends AbstractMojo {
+
+ /**
+ * Source directory containing the copied class files.
+ *
+ * @parameter expression = "${resourceDirectory}" default-value="${project.basedir}/src/main/resources"
+ * @required
+ */
+ private String resourceDirectory;
+
+ /**
+ * Output directory
+ *
+ * @parameter expression = "${outputDirectory}" default-value="${project.build.directory}/par-archive"
+ * @required
+ */
+ private String outputDirectory;
+
+ /**
+ * @parameter expression = "${includes}"
+ */
+ private String[] includes;
+
+ /**
+ * @parameter expression = "${excludes}"
+ */
+ private String[] excludes;
+
+ /**
+ * The maven project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
+ public void execute() throws MojoExecutionException, MojoFailureException {
+ if (!new File(resourceDirectory).exists()) {
+ getLog().info("ANDROID-904-001: No resource files to copy");
+ return;
+ }
+
+ if(!new File(outputDirectory).exists())
+ {
+ new File(outputDirectory).mkdirs();
+ }
+ DirectoryScanner directoryScanner = new DirectoryScanner();
+ directoryScanner.setBasedir(resourceDirectory);
+
+ List<String> excludeList = new ArrayList<String>();
+ //target files
+ excludeList.add("target/**");
+
+ List<String> includeList = new ArrayList<String>();
+ includeList.add("**/*");
+
+ directoryScanner.setIncludes(includeList.toArray(includes));
+ for (int i = 0; i < excludes.length; ++i) {
+ excludeList.add(excludes[i]);
+ }
+ directoryScanner.setExcludes(excludeList.toArray(excludes));
+ directoryScanner.addDefaultExcludes();
+
+ directoryScanner.scan();
+ String[] files = directoryScanner.getIncludedFiles();
+ getLog().info("ANDROID-904-002: Copying resource files: From = " + resourceDirectory + ", To = " +
+ outputDirectory + ", File Count = " + files.length);
+ for (String file : files) {
+ try {
+ File sourceFile = new File(resourceDirectory, file);
+ File targetFile = new File(outputDirectory, file);
+ if (sourceFile.lastModified() > targetFile.lastModified()) {
+ FileUtils.copyFile(sourceFile, targetFile);
+ targetFile.setLastModified(System.currentTimeMillis());
+ }
+ }
+ catch (IOException e) {
+ throw new MojoExecutionException("ANDROID-904-000: Unable to process resources", e);
+ }
+ }
+
+ Set<Artifact> directDependentArtifacts = project.getDependencyArtifacts();
+ if (directDependentArtifacts != null) {
+ for (Artifact artifact : directDependentArtifacts) {
+ String type = artifact.getType();
+ if (type.equals("android:apk")) {
+ try {
+ FileUtils.copyFile(artifact.getFile(), new File(outputDirectory, artifact.getFile().getName()));
+ } catch (IOException e) {
+ throw new MojoExecutionException("ANDROID-904-003: Unable to process resources", e);
+ }
+ }
+ }
+ }
+ }
+}
Modified: maven/sandbox/trunk/plugins/maven-android/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/pom.xml?rev=641899&r1=641898&r2=641899&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-android/pom.xml Thu Mar 27 10:08:22 2008
@@ -32,6 +32,7 @@
<module>maven-adb-plugin</module>
<module>maven-android-core</module>
<module>maven-dx-plugin</module>
+ <module>maven-par-plugin</module>
</modules>
<dependencies>
<dependency>
@@ -42,7 +43,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-34</version>
+ <version>1.0-alpha-15</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>