Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

...
  • 18 commits
  • 43 files changed
  • 0 commit comments
  • 2 contributors
Commits on Mar 15, 2012
Martin Eisengardt mepeisen site fixtures 127ba3f
Erik Dannenberg Added phpunit.xml support for new PHPUnit impl. c442dde
Erik Dannenberg Added missing whitespace after getExtraArguments(). 532bd90
Erik Dannenberg Moved unphar fix to new PharPackager. 05bc896
Erik Dannenberg Fixed prepare(Test)CompileDependencies() to use new project config. 840ba01
Erik Dannenberg Set phpunit.xml path in PhpTest. e34771f
Erik Dannenberg Moved exception handling for prepare(Test)Dependencies() down to PhpM…
…ojoHelper.
c26371b
Erik Dannenberg Added archetype-parent project. 4891b44
Erik Dannenberg Added doctrine orm archetype. d4b7816
Erik Dannenberg Added archetype-parent to build. 47f7a09
Martin Eisengardt mepeisen Merge branch 'master' of https://mepeisen@github.com/php-maven/maven-…
…php-plugin.git
0f2c409
Martin Eisengardt mepeisen doctrine archetype and archetype parent pom 89e81c1
Commits on Mar 16, 2012
Martin Eisengardt mepeisen test case fixtures (wrong name of php parent pom) 4e16bca
Martin Eisengardt mepeisen test case fix (case of file names that were expected) 2421245
Commits on Mar 17, 2012
Martin Eisengardt mepeisen additional debugging output of the test file walker 1f9d097
Martin Eisengardt mepeisen speed hack for hudson 1b4153c
Commits on Mar 19, 2012
Erik Dannenberg Merge remote branch 'upstream/master'
nit impl.

Conflicts:
	branches/2.0-SNAPSHOT/archetypes/php5-doctrine-archetype/pom.xml
	branches/2.0-SNAPSHOT/archetypes/php5-doctrine-archetype/src/main/resources/archetype-resources/pom.xml
	branches/2.0-SNAPSHOT/archetypes/pom.xml
	branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/build/PhpTest.java
	branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/php/PhpMojoHelper.java
88bd5ea
Erik Dannenberg Decoupled dependency extraction. 1c0e6d4
Showing with 645 additions and 149 deletions.
  1. +56 −0 branches/2.0-SNAPSHOT/archetypes/archetype-parent/pom.xml
  2. +2 −26 branches/2.0-SNAPSHOT/archetypes/php5-doctrine-archetype/pom.xml
  3. +3 −3 branches/2.0-SNAPSHOT/archetypes/php5-doctrine-archetype/src/main/resources/archetype-resources/pom.xml
  4. +3 −3 branches/2.0-SNAPSHOT/archetypes/php5-lib-archetype/pom.xml
  5. +3 −3 branches/2.0-SNAPSHOT/archetypes/php5-web-archetype/pom.xml
  6. +3 −3 branches/2.0-SNAPSHOT/archetypes/php5-zend-archetype/pom.xml
  7. +1 −0  branches/2.0-SNAPSHOT/archetypes/pom.xml
  8. +8 −0 branches/2.0-SNAPSHOT/archetypes/src/site/xdoc/index.xml
  9. +71 −0 branches/2.0-SNAPSHOT/maven-php-plugin-test/src/test/java/org/phpmaven/archetypes/test/DoctrineTest.java
  10. +10 −0 ....0-SNAPSHOT/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/archetypes/doctrine/pom.xml
  11. +1 −1  .../maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-autoprepend/pom.xml
  12. +1 −1  ...OT/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-bootstrap/pom.xml
  13. +1 −1  ...SHOT/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-failing/pom.xml
  14. +1 −1  ...SHOT/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-notests/pom.xml
  15. +1 −1  ...n-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-oktests-multiple/pom.xml
  16. +1 −1  ...SHOT/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-oktests/pom.xml
  17. +1 −1  ...OT/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-with-dep1/pom.xml
  18. +1 −1  ...OT/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-with-dep2/pom.xml
  19. +87 −0 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/build/AbstractPhpExtractMojo.java
  20. +1 −17 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/build/AbstractPhpResources.java
  21. +34 −0 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/build/PhpExtractDeps.java
  22. +0 −11 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/build/PhpTest.java
  23. +34 −0 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/build/PhpTestExtractDeps.java
  24. +10 −56 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/php/PhpMojoHelper.java
  25. +21 −1 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/php/PhpUnitTestfileWalker.java
  26. +1 −2  branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/report/PhpUnitCoverage.java
  27. +5 −1 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/resources/META-INF/plexus/components.xml
  28. +73 −0 branches/2.0-SNAPSHOT/src/site/include/pom_doctrine.xml
  29. +1 −1  branches/2.0-SNAPSHOT/src/site/xdoc/developer.xml.vm
  30. +121 −0 branches/2.0-SNAPSHOT/src/site/xdoc/php-doctrine-5min.xml.vm
  31. +1 −0  branches/2.0-SNAPSHOT/src/site/xdoc/tutorials.xml.vm
  32. +24 −3 pom.xml
  33. +44 −0 sites/www.php-maven.org/src/site/xdoc/feed.xml.vm
  34. +1 −1  .../maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-autoprepend/pom.xml
  35. +1 −1  ...-3/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-bootstrap/pom.xml
  36. +1 −1  ...ta-3/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-failing/pom.xml
  37. +1 −1  ...ta-3/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-notests/pom.xml
  38. +1 −1  ...n-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-oktests-multiple/pom.xml
  39. +1 −1  ...ta-3/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-oktests/pom.xml
  40. +1 −1  ...-3/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-with-dep1/pom.xml
  41. +1 −1  ...-3/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-with-dep2/pom.xml
  42. +1 −1  tags/2.0.0-beta-3/src/site/xdoc/developer.xml.vm
  43. +11 −2 tags/pom.xml
56 branches/2.0-SNAPSHOT/archetypes/archetype-parent/pom.xml
View
@@ -0,0 +1,56 @@
+<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>
+
+ <properties>
+ <phpmavenTagName>${project.version}</phpmavenTagName>
+ </properties>
+
+ <parent>
+ <groupId>org.phpmaven.build</groupId>
+ <artifactId>generic-java-parent</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../java-parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.phpmaven.build</groupId>
+ <artifactId>archetype-parent</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>archetype-parent:${project.version}</name>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.2</version>
+ </extension>
+ </extensions>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.phpmaven.sites</groupId>
+ <artifactId>sitemap-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+<!--
+ <distributionManagement>
+ <site>
+ <id>upload-${phpmavenSitesId}</id>
+ <name>${phpmavenSitesName}</name>
+ <url>${phpmavenSitesUploadUrl}/var/sites-aggregator</url>
+ </site>
+ </distributionManagement>
+ -->
+
+</project>
28 branches/2.0-SNAPSHOT/archetypes/php5-doctrine-archetype/pom.xml
View
@@ -11,9 +11,9 @@
<parent>
<groupId>org.phpmaven.build</groupId>
- <artifactId>generic-java-parent</artifactId>
+ <artifactId>archetype-parent</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../java-parent/pom.xml</relativePath>
+ <relativePath>../archetype-parent/pom.xml</relativePath>
</parent>
<groupId>org.phpmaven</groupId>
@@ -32,29 +32,5 @@
<url>${phpmavenSitesUploadUrl}/${phpmavenTagType}/${phpmavenTagName}/archetypes/${project.artifactId}/</url>
</site>
</distributionManagement>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>2.2</version>
- </extension>
- </extensions>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.phpmaven.sites</groupId>
- <artifactId>sitemap-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
6 branches/2.0-SNAPSHOT/archetypes/php5-doctrine-archetype/src/main/resources/archetype-resources/pom.xml
View
@@ -39,13 +39,13 @@
<!-- enable doctrine dev mode -->
<doctrine.dev.mode>true</doctrine.dev.mode>
<!-- use maven supplied doctrine -->
- <doctrine.directory>../php-deps</doctrine.directory>
- <doctrine.db.driver>sqlite</doctrine.db.driver>
- <!-- sqlite for dev, use relative path from app root -->
+ <doctrine.directory>../php-deps/pear</doctrine.directory>
+ <!-- sqlite for dev, use relative path from app root for db file-->
<doctrine.db.driver>sqlite</doctrine.db.driver>
<doctrine.db.path>../../myapp.sqlite</doctrine.db.path>
</properties>
</profile>
+
<profile>
<id>production</id>
<activation>
6 branches/2.0-SNAPSHOT/archetypes/php5-lib-archetype/pom.xml
View
@@ -11,15 +11,15 @@
<parent>
<groupId>org.phpmaven.build</groupId>
- <artifactId>generic-java-parent</artifactId>
+ <artifactId>archetype-parent</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../java-parent/pom.xml</relativePath>
+ <relativePath>../archetype-parent/pom.xml</relativePath>
</parent>
<groupId>org.phpmaven</groupId>
<artifactId>php5-lib-archetype</artifactId>
<version>2.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>maven-archetype</packaging>
<name>PHP ARCHETYPE: PHP LIBRARY ${project.version}</name>
6 branches/2.0-SNAPSHOT/archetypes/php5-web-archetype/pom.xml
View
@@ -11,15 +11,15 @@
<parent>
<groupId>org.phpmaven.build</groupId>
- <artifactId>generic-java-parent</artifactId>
+ <artifactId>archetype-parent</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../java-parent/pom.xml</relativePath>
+ <relativePath>../archetype-parent/pom.xml</relativePath>
</parent>
<groupId>org.phpmaven</groupId>
<artifactId>php5-web-archetype</artifactId>
<version>2.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>maven-archetype</packaging>
<name>PHP ARCHETYPE: PHP WEB MODULE ${project.version}</name>
6 branches/2.0-SNAPSHOT/archetypes/php5-zend-archetype/pom.xml
View
@@ -11,15 +11,15 @@
<parent>
<groupId>org.phpmaven.build</groupId>
- <artifactId>generic-java-parent</artifactId>
+ <artifactId>archetype-parent</artifactId>
<version>2.0-SNAPSHOT</version>
- <relativePath>../../java-parent/pom.xml</relativePath>
+ <relativePath>../archetype-parent/pom.xml</relativePath>
</parent>
<groupId>org.phpmaven</groupId>
<artifactId>php5-zend-archetype</artifactId>
<version>2.0-SNAPSHOT</version>
- <packaging>jar</packaging>
+ <packaging>maven-archetype</packaging>
<name>PHP ARCHETYPE: PHP ZEND ${project.version}</name>
1  branches/2.0-SNAPSHOT/archetypes/pom.xml
View
@@ -35,6 +35,7 @@
</distributionManagement>
<modules>
+ <module>archetype-parent</module>
<module>php5-doctrine-archetype</module>
<module>php5-lib-archetype</module>
<module>php5-web-archetype</module>
8 branches/2.0-SNAPSHOT/archetypes/src/site/xdoc/index.xml
View
@@ -43,6 +43,14 @@ However if you maintain you own archetype let us know. We will list it here.</p>
<a href="http://nexus.php-maven.org/index.html#nexus-search;quick~php5-zend-archetype">Nexus search</a></td>
<td>A small zend framework application.</td>
</tr>
+ <tr>
+ <td>org.phpmaven</td>
+ <td>php5-doctrine-archetype</td>
+ <td>php-maven.org</td>
+ <td>Served by official repository<br />
+ <a href="http://nexus.php-maven.org/index.html#nexus-search;quick~php5-doctrine-archetype">Nexus search</a></td>
+ <td>A small doctrine project.</td>
+ </tr>
</table>
</section>
</body>
71 branches/2.0-SNAPSHOT/maven-php-plugin-test/src/test/java/org/phpmaven/archetypes/test/DoctrineTest.java
View
@@ -0,0 +1,71 @@
+/**
+ * Copyright 2010-2012 by PHP-maven.org
+ *
+ * Licensed 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 org.phpmaven.archetypes.test;
+
+import java.io.File;
+
+import org.apache.maven.it.Verifier;
+import org.phpmaven.test.AbstractTestCase;
+
+/**
+ * Tests the php5-doctrine-archetype.
+ *
+ * @author Martin Eisengardt <Martin.Eisengardt@googlemail.com>
+ * @since 2.0.0
+ */
+public class DoctrineTest extends AbstractTestCase {
+
+ /**
+ * tests the goal "package" after installing the archetype.
+ *
+ * @throws Exception
+ */
+ public void testPackage() throws Exception {
+ final Verifier verifier = this.getPhpMavenVerifier("archetypes/doctrine");
+
+ final File localReposDir = getLocalReposDir();
+ this.installToRepos(localReposDir.getAbsolutePath(), "../archetypes");
+
+ verifier.addCliOption("-DarchetypeGroupId=org.phpmaven");
+ verifier.addCliOption("-DarchetypeArtifactId=php5-doctrine-archetype");
+ verifier.addCliOption("-DarchetypeVersion=2.0-SNAPSHOT");
+ verifier.addCliOption("-DgroupId=org.sample");
+ verifier.addCliOption("-DartifactId=my-app");
+ verifier.addCliOption("-Dversion=0.0.1-SNAPSHOT");
+ verifier.addCliOption("-DinteractiveMode=false");
+
+ verifier.executeGoal("archetype:generate");
+ verifier.verifyErrorFreeLog();
+
+ verifier.assertFilePresent("my-app/pom.xml");
+ verifier.assertFilePresent("my-app/src/main/php/MyApp/Entities/MyModel.php");
+ verifier.assertFilePresent("my-app/src/main/php/bootstrap_doctrine.php");
+ verifier.assertFilePresent("my-app/src/main/php/bootstrap.php");
+ verifier.assertFilePresent("my-app/src/main/php/cli-config.php");
+ verifier.assertFilePresent("my-app/src/main/php/cli-tools.php");
+ verifier.assertFilePresent("my-app/src/main/php/my-app.php");
+ verifier.assertFilePresent("my-app/src/main/resources/config/doctrine.ini");
+ verifier.assertFilePresent("my-app/src/site/apt/index.apt");
+ verifier.assertFilePresent("my-app/src/site/site.xml");
+
+ final Verifier verifier2 = this.getVerifierWithoutPrepare("archetypes/doctrine");
+ verifier2.executeGoal("package");
+ verifier2.verifyErrorFreeLog();
+ verifier2.assertFilePresent("my-app/target/my-app-0.0.1-SNAPSHOT.phar");
+ }
+
+}
10 ...SNAPSHOT/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/archetypes/doctrine/pom.xml
View
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+ <groupId>org.phpmaven.test</groupId>
+ <artifactId>core-empty-pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+</project>
2  ...ven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-autoprepend/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
2  ...maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-bootstrap/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
2  ...T/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-failing/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
2  ...T/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-notests/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
2  ...hp-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-oktests-multiple/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
2  ...T/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-oktests/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
2  ...maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-with-dep1/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
2  ...maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-with-dep2/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
87 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/build/AbstractPhpExtractMojo.java
View
@@ -0,0 +1,87 @@
+/**
+ * Licensed 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 org.phpmaven.plugin.build;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.configuration.PlexusConfigurationException;
+import org.phpmaven.core.IComponentFactory;
+import org.phpmaven.plugin.lint.LintExecution;
+import org.phpmaven.plugin.lint.LintHelper;
+import org.phpmaven.plugin.php.AbstractPhpWalkHelper;
+import org.phpmaven.plugin.php.IPhpWalkConfigurationMojo;
+import org.phpmaven.plugin.php.MultiException;
+import org.phpmaven.plugin.php.PhpErrorException;
+import org.phpmaven.plugin.php.PhpException;
+import org.phpmaven.project.IProjectPhpExecution;
+
+
+/**
+ * Base class for the extract dependencies mojos.
+ *
+ * @requiresDependencyResolution compile
+ * @author Erik Dannenberg
+ */
+public abstract class AbstractPhpExtractMojo extends AbstractPhpMojo {
+
+ /**
+ * Returns the scope from which dependencies should be unpacked from.
+ * @return target scope
+ */
+ protected abstract String getTargetScope();
+
+ @Override
+ public void execute() throws MojoExecutionException {
+ getLog().info("Unpacking dependencies...");
+ IProjectPhpExecution config = null;
+ File targetDir = null;
+ try {
+ config = factory.lookup(
+ IProjectPhpExecution.class,
+ IComponentFactory.EMPTY_CONFIG,
+ this.getSession());
+
+ if (Artifact.SCOPE_TEST.equals(getTargetScope())) {
+ targetDir = config.getTestDepsDir();
+ } else {
+ targetDir = config.getDepsDir();
+ }
+ } catch (ComponentLookupException ex) {
+ throw new MojoExecutionException(ex.getMessage(), ex);
+ } catch (PlexusConfigurationException ex) {
+ throw new MojoExecutionException(ex.getMessage(), ex);
+ } catch (ExpressionEvaluationException ex) {
+ throw new MojoExecutionException(ex.getMessage(), ex);
+ }
+
+ try {
+ this.getPhpHelper().prepareDependencies(this.factory, this.getSession(), targetDir, getTargetScope());
+ } catch (MultiException e) {
+ throw new MojoExecutionException(e.getMessage(), e);
+ } catch (PhpException e) {
+ throw new MojoExecutionException(e.getMessage(), e);
+ } catch (IOException e) {
+ throw new MojoExecutionException(e.getMessage(), e);
+ }
+ }
+
+}
18 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/build/AbstractPhpResources.java
View
@@ -149,30 +149,14 @@ public void execute() throws MojoExecutionException {
// resolve wildcards in excludeFromValidation
excludeFromValidation = FileHelper.getWildcardMatches(excludeFromValidation, getSourceDirectory(), false);
-
- getLog().info("Unpacking dependencies");
-
+
try {
- // TODO Is this correct?!?
- if (!isIgnoreValidate()) {
- try {
- this.getPhpHelper().prepareCompileDependencies(this.factory, this.getSession());
- } catch (ComponentLookupException ex) {
- throw new MojoExecutionException(ex.getMessage(), ex);
- } catch (ExpressionEvaluationException ex) {
- throw new MojoExecutionException(ex.getMessage(), ex);
- } catch (PlexusConfigurationException ex) {
- throw new MojoExecutionException(ex.getMessage(), ex);
- }
- }
getLog().info("Copying php files");
new PhpWalkHelper(this).goRecursiveAndCall(this.getSourceFolder());
} catch (MultiException e) {
throw new MojoExecutionException(e.getMessage(), e);
} catch (PhpException e) {
throw new MojoExecutionException(e.getMessage(), e);
- } catch (IOException e) {
- throw new MojoExecutionException(e.getMessage(), e);
}
if (this.useRunkit) {
34 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/build/PhpExtractDeps.java
View
@@ -0,0 +1,34 @@
+/**
+ * Licensed 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 org.phpmaven.plugin.build;
+
+import java.io.File;
+import org.apache.maven.artifact.Artifact;
+
+/**
+ * Extracts all compile dependencies.
+ *
+ * @requiresDependencyResolution compile
+ * @goal extractDependencies
+ * @author Erik Dannenberg
+ */
+public final class PhpExtractDeps extends AbstractPhpExtractMojo {
+
+ @Override
+ protected String getTargetScope() {
+ return Artifact.SCOPE_COMPILE;
+ }
+
+}
11 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/build/PhpTest.java
View
@@ -242,15 +242,6 @@ public void execute() throws MojoExecutionException, MojoFailureException {
// did we get a testing file?
if (files.iterator().hasNext()) {
- try {
- getPhpHelper().prepareTestDependencies(this.factory, this.getSession());
- } catch (ComponentLookupException ex) {
- throw new MojoExecutionException(ex.getMessage(), ex);
- } catch (ExpressionEvaluationException ex) {
- throw new MojoExecutionException(ex.getMessage(), ex);
- } catch (PlexusConfigurationException ex) {
- throw new MojoExecutionException(ex.getMessage(), ex);
- }
getLog().info(
"\n-------------------------------------------------------\n" +
"T E S T S\n" +
@@ -301,8 +292,6 @@ public void execute() throws MojoExecutionException, MojoFailureException {
throw new MojoExecutionException(e.getMessage(), e);
} catch (PhpException e) {
throw new MojoExecutionException(e.getMessage(), e);
- } catch (IOException e) {
- throw new MojoExecutionException(e.getMessage(), e);
}
}
34 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/build/PhpTestExtractDeps.java
View
@@ -0,0 +1,34 @@
+/**
+ * Licensed 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 org.phpmaven.plugin.build;
+
+import java.io.File;
+import org.apache.maven.artifact.Artifact;
+
+
+/**
+ * Extracts all test dependencies.
+ *
+ * @requiresDependencyResolution test
+ * @goal extractTestDependencies
+ * @author Erik Dannenberg
+ */
+public final class PhpTestExtractDeps extends AbstractPhpExtractMojo {
+
+ @Override
+ protected String getTargetScope() {
+ return Artifact.SCOPE_TEST;
+ }
+}
66 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/php/PhpMojoHelper.java
View
@@ -24,6 +24,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
@@ -49,6 +50,7 @@
* @author Christian Wiedemann
* @author Tobias Sarnowski
* @author Martin Eisengardt
+ * @author Erik Dannenberg
*/
public class PhpMojoHelper implements IPhpExecution {
@@ -390,7 +392,7 @@ protected MavenProject getProjectFromArtifact(final Artifact a) throws ProjectBu
}
/**
- * Unzips all compile dependency sources.
+ * Unzips all dependency sources.
*
* @param factory Component factory
* @param session maven session
@@ -398,24 +400,16 @@ protected MavenProject getProjectFromArtifact(final Artifact a) throws ProjectBu
* @throws IOException if something goes wrong while prepareing the dependencies
* @throws PhpException php exceptions can fly everywhere..
*/
- public void prepareCompileDependencies(IComponentFactory factory, MavenSession session)
- throws IOException, PhpException, ComponentLookupException, ExpressionEvaluationException, PlexusConfigurationException {
+ public void prepareDependencies(IComponentFactory factory, MavenSession session, File targetDir, String scope)
+ throws IOException, PhpException, MojoExecutionException {
final List<String> packedElements = new ArrayList<String>();
final Set<Artifact> deps = this.project.getArtifacts();
- final IProjectPhpExecution config = factory.lookup(
- IProjectPhpExecution.class,
- IComponentFactory.EMPTY_CONFIG,
- session);
+
for (final Artifact dep : deps) {
- this.log.info("dependency " +
- dep.getGroupId() + ":" +
- dep.getArtifactId() + ":" +
- dep.getVersion() + ":" +
- dep.getScope() + "@" +
- dep.getFile().getAbsolutePath());
- if (Artifact.SCOPE_TEST.equals(dep.getScope())) {
+ if (!scope.equals(dep.getScope())) {
continue;
}
+ this.log.info(dep.getFile().getAbsolutePath());
try {
if (this.getProjectFromArtifact(dep).getFile() != null) {
// Reference to a local project; should only happen in IDEs
@@ -428,50 +422,10 @@ public void prepareCompileDependencies(IComponentFactory factory, MavenSession s
}
packedElements.add(dep.getFile().getAbsolutePath());
}
- FileHelper.unzipElements(this.log, config.getDepsDir(), packedElements, factory, session);
- }
+ FileHelper.unzipElements(this.log, targetDir, packedElements, factory, session);
- /**
- * Unzips all test dependency sources.
- *
- * @param factory Component factory
- * @param session maven session
- *
- * @throws IOException if something goes wrong while prepareing the dependencies
- * @throws PhpException php exceptions can fly everywhere..
- */
- public void prepareTestDependencies(IComponentFactory factory, MavenSession session)
- throws IOException, PhpException, ComponentLookupException, ExpressionEvaluationException, PlexusConfigurationException {
- final List<String> packedElements = new ArrayList<String>();
- final Set<Artifact> deps = this.project.getArtifacts();
- final IProjectPhpExecution config = factory.lookup(
- IProjectPhpExecution.class,
- IComponentFactory.EMPTY_CONFIG,
- session);
- for (final Artifact dep : deps) {
- this.log.info("dependency " +
- dep.getGroupId() + ":" +
- dep.getArtifactId() + ":" +
- dep.getVersion() + ":" +
- dep.getScope() + "@" +
- dep.getFile().getAbsolutePath());
- if (!Artifact.SCOPE_TEST.equals(dep.getScope())) {
- continue;
- }
- try {
- if (this.getProjectFromArtifact(dep).getFile() != null) {
- // Reference to a local project; should only happen in IDEs
- this.log.debug("Dependency resolved to a local project. skipping.");
- // XXX: Should we support this or is this only relevant within IDEs (f.e. eclipse)?
- continue;
- }
- } catch (ProjectBuildingException ex) {
- throw new IOException("Problems creating maven project from dependency", ex);
- }
- packedElements.add(dep.getFile().getAbsolutePath());
- }
- FileHelper.unzipElements(this.log, config.getTestDepsDir(), packedElements, factory, session);
}
+
/**
* Executes PHP code snippet with the given arguments and returns its output.
22 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/php/PhpUnitTestfileWalker.java
View
@@ -65,7 +65,25 @@ public PhpUnitTestfileWalker(IPhpunitConfigurationMojo config) throws MultiExcep
}
// XXX: Support for multiple source directories; see Eclipse plugin: PhpmavenTestExecution
- final File testSourceFolder = new File(config.getProject().getTestCompileSourceRoots().get(0).toString());
+ config.getLog().debug("Starting test file walker.");
+ final String testCompiledSource = config.getProject().getTestCompileSourceRoots().get(0).toString();
+ if (config.getLog().isDebugEnabled()) {
+ config.getLog().debug("param testCompilSourceRoot: " + testCompiledSource);
+ config.getLog().debug("param isFailIfNoTests: " + (config.isFailIfNoTests() ? "true" : "false"));
+ config.getLog().debug("param testPostfix: " + config.getTestPostfix());
+ config.getLog().debug("param phpFileEnding: " + config.getPhpFileEnding());
+ if (config.getExcludes() != null) {
+ for (final String exclude : config.getExcludes()) {
+ config.getLog().debug("param excludes: " + exclude);
+ }
+ }
+ if (config.getIncludes() != null) {
+ for (final String include : config.getIncludes()) {
+ config.getLog().debug("param includes: " + include);
+ }
+ }
+ }
+ final File testSourceFolder = new File(testCompiledSource);
if (!testSourceFolder.isDirectory()) {
config.getLog().info("No test cases found; skipping.");
if (config.isFailIfNoTests()) {
@@ -104,9 +122,11 @@ protected boolean isTestFile(File file) {
@Override
protected void handlePhpFile(File file) throws MojoExecutionException {
if (!isTestFile(file)) {
+ config.getLog().debug("This is no test file: skipping " + file.getAbsolutePath());
return;
}
+ config.getLog().debug("Adding file as test file " + file.getAbsolutePath());
this.testFiles.add(file);
}
3  branches/2.0-SNAPSHOT/maven-php-plugin/src/main/java/org/phpmaven/plugin/report/PhpUnitCoverage.java
View
@@ -184,8 +184,7 @@ protected void executeReport(Locale locale) throws MavenReportException {
// did we get any test file?
if (files.iterator().hasNext()) {
- getPhpHelper().prepareTestDependencies(this.factory, this.getSession());
-
+
final IPhpunitConfiguration config = this.factory.lookup(
IPhpunitConfiguration.class,
IComponentFactory.EMPTY_CONFIG,
6 branches/2.0-SNAPSHOT/maven-php-plugin/src/main/resources/META-INF/plexus/components.xml
View
@@ -17,12 +17,16 @@
org.phpmaven:maven-php-plugin:set-sources
</pre-site>
<generate-resources>
- org.apache.maven.plugins:maven-plugin-plugin:descriptor
+ org.apache.maven.plugins:maven-plugin-plugin:descriptor,
+ org.phpmaven:maven-php-plugin:extractDependencies
</generate-resources>
<process-resources>
org.apache.maven.plugins:maven-resources-plugin:resources,
org.phpmaven:maven-php-plugin:resources
</process-resources>
+ <generate-test-resources>
+ org.phpmaven:maven-php-plugin:extractTestDependencies
+ </generate-test-resources>
<process-test-resources>
org.apache.maven.plugins:maven-resources-plugin:testResources,
org.phpmaven:maven-php-plugin:testResources
73 branches/2.0-SNAPSHOT/src/site/include/pom_doctrine.xml
View
@@ -0,0 +1,73 @@
+<!-- START SNIPPET: pom -->
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.phpmaven</groupId>
+ <artifactId>php-parent-pom</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <phpunit.version>3.6.10</phpunit.version>
+ <!-- doctrine version -->
+ <doctrine.orm.version>2.2.0</doctrine.orm.version>
+ <!-- also needs to reflect the real root folder for your autoloading classes -->
+ <doctrine.classloader.name>MyApp</doctrine.classloader.name>
+ <!-- only use relative path from app root -->
+ <doctrine.classloader.base>.</doctrine.classloader.base>
+ </properties>
+
+ <groupId>org.sample</groupId>
+ <artifactId>my-app</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>php</packaging>
+
+ <name>PHP 5 Doctrine Project</name>
+ <description>Simple PHP 5 doctrine project.</description>
+ <url>http://www.php-maven.org</url>
+ <inceptionYear>2012</inceptionYear>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <!-- enable doctrine dev mode -->
+ <doctrine.dev.mode>true</doctrine.dev.mode>
+ <!-- use maven supplied doctrine -->
+ <doctrine.directory>../php-deps/pear</doctrine.directory>
+ <!-- sqlite for dev, use relative path from app root for db file-->
+ <doctrine.db.driver>sqlite</doctrine.db.driver>
+ <doctrine.db.path>../../myapp.sqlite</doctrine.db.path>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>production</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <!-- disable doctrine dev mode -->
+ <doctrine.dev.mode>false</doctrine.dev.mode>
+ <!-- use pear supplied doctrine-->
+ <doctrine.directory>pear</doctrine.directory>
+ <!-- mysql for production -->
+ <doctrine.db.driver>mysql</doctrine.db.driver>
+ <doctrine.db.host>localhost</doctrine.db.host>
+ <doctrine.db.port>3306</doctrine.db.port>
+ <doctrine.db.name>doctrine_db</doctrine.db.name>
+ <doctrine.db.user>doctrine_user</doctrine.db.user>
+ <doctrine.db.password>foobar</doctrine.db.password>
+ </properties>
+ </profile>
+ </profiles>
+.
+.
+.
+<!-- END SNIPPET: pom -->
2  branches/2.0-SNAPSHOT/src/site/xdoc/developer.xml.vm
View
@@ -18,7 +18,7 @@
<ul>
<li>At first you should setup eclipse.
<ul>
- <li>Install at least 1.6 jdk: <a href="http://java.sun.com/">http://www.oracle.com/technetwork/java/javase/downloads/index.html</li>
+ <li>Install at least 1.6 jdk: <a href="http://java.sun.com/">http://www.oracle.com/technetwork/java/javase/downloads/index.html</a></li>
<li>Download eclipse ide for java developers: <a href="http://www.eclipse.org/downloads/">eclipye download url</a>.</li>
<li>After first starting eclipse set the proper jdk at window->preferences->java->installed JRE (eclipse may only see the jre and not the jdk</li>
<li>Install checkstyle plugin: <a href="http://eclipse-cs.sourceforge.net/downloads.html">Install manual</a></li>
121 branches/2.0-SNAPSHOT/src/site/xdoc/php-doctrine-5min.xml.vm
View
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+ <properties>
+ <author email="christian.wiedemann@key-tec.de">
+ Christian Wiedemann
+ </author>
+ <author email="martin.eisengardt@googlemail.com">
+ Martin Eisengardt
+ </author>
+ <author email="erik.dannenberg@bbe-consulting.de">
+ Erik Dannenberg
+ </author>
+
+ <title>Maven for PHP doctrine framework applications - 5 minutes starter guide</title>
+ </properties>
+ <meta name="keyword" content="apache, maven, php"></meta>
+ <body>
+ <section name="PHP doctrine projects - 5 minutes starter guide">
+ <subsection name="Create a project">
+ <p>
+ First, prepare Maven and follow the <a href="${phpmavenRootUrl}/prepare.html">preparation instructions.</a><br></br>
+ Next, type the following Maven goal in your command line and execute it
+ (Note that PHP 4 is not supported since phpmaven2.):</p>
+<b>PHP 5:</b>
+<source>
+mvn archetype:generate \
+-DarchetypeGroupId=org.phpmaven \
+-DarchetypeArtifactId=php5-doctrine-archetype \
+-DarchetypeVersion=${phpmavenTagName} \
+-DgroupId=org.sample \
+-DartifactId=my-app \
+-Dversion=0.0.1-SNAPSHOT
+ </source>
+ After some time maven will ask to confirm the parameters. The result will look like this:
+ <source>
+my-app
+ |-- pom.xml
+ `-- src
+ |-- main
+ |-- php
+ `-- bootstrap_doctrine.php
+ `-- bootstrap.php
+ `-- cli-config.php
+ `-- cli-tools.php
+ |-- MyApp
+ |-- Entities
+ `-- MyModel.php
+ `-- my-app.php
+ |-- resources
+ |-- config
+ `-- doctrine.ini
+ </source>
+ <p>
+
+ <ul>
+ <li><b>src/main/php/lib</b> - contains the project source code</li>
+ <li><b>src/main/php/resources</b> - contains the additional resources; all non-php files like yaml, xml, etc</li>
+ <li><b>src/test/php</b> - contains the test source code</li>
+ <li><b>pom.xml</b> The project&apos;s Project Object Model, or POM, looks like this:</li>
+ </ul>
+ </p>
+ </subsection>
+ <subsection name="The POM">
+ <p>
+<macro name="snippet">
+<param name="id" value="pom"></param>
+<param name="file" value="${phpmavenFsRoot}/src/site/include/pom_doctrine.xml"></param>
+</macro></p>
+ </subsection>
+ <subsection name="What have I just done?">
+ <p>What have I just done?</p>
+ You have just executed the Maven goal archetype:generate and passed
+ various parameters to that goal. The prefix archetype is
+ the plugin containing the goal.
+ This goal created a default project structure for your PHP project.
+ </subsection>
+ <subsection name="Build the project">
+ Switch to your sample project directory
+ <source>cd my-app</source>
+ and run:
+ <source>mvn package</source>
+ The command line will print out various actions, ending with the following:
+ <source>
+ ...
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESSFUL
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 6 seconds
+[INFO] Finished at: Thu Jul 20 19:15:06 CDT 2008
+[INFO] Final Memory: 3M/6M
+[INFO] ------------------------------------------------------------------------
+ </source>
+Maven has created a phar package under the project&apos;s target folder.
+ </subsection>
+ <subsection name="What has Maven done?">
+ <p>
+
+ &quot;Maven for PHP&quot; validates the PHP code with the php.exe, runs PHPUnit tests, and creates an assembly for the web project.</p>
+ </subsection>
+ <subsection name="Setup the database schema">
+ <p>
+ Your project is almost ready to run now, all that is left is creating the database schema, switch to the unified app root <source>cd target/classes</source>.
+ Now run <source>php cli-tools.php orm:schema-tool:create</source>
+ The default profile is configured to use sqlite as database so no further configuration is needed.
+ A sample configuration for mysql can be found in the production profile. To activate the profile
+ when building the project use <source>mvn package -Pproduction</source>
+ </p>
+ </subsection>
+ <subsection name="Run the app">
+ <p>
+ We can now run the app with <source>php my-app.php</source>
+ </p>
+ </subsection>
+ <subsection name="Documentation">
+ <p>
+ Go to the <a href="documentation.html">&quot;Documentation&quot; section.</a>
+ </p>
+ </subsection>
+ </section>
+ </body>
+</document>
1  branches/2.0-SNAPSHOT/src/site/xdoc/tutorials.xml.vm
View
@@ -45,6 +45,7 @@
<li><a href="php-lib-5min.html"><span style="white-space: nowrap; font-weight: bold; font-size: 1.25em;">Library (5 minutes)</span><br></br>A small 5 minute example to create a library.<br></br></a></li>
<li><a href="php-web-5min.html"><span style="white-space: nowrap; font-weight: bold; font-size: 1.25em;">Website (5 minutes)</span><br></br>Create a website project in 5 minutes.<br></br></a></li>
<li><a href="php-zend-5min.html"><span style="white-space: nowrap; font-weight: bold; font-size: 1.25em;">Zend-Framework (5 minutes)</span><br></br>Create your zend framework web application in 5 minutes.<br></br></a></li>
+ <li><a href="php-doctrine-5min.html"><span style="white-space: nowrap; font-weight: bold; font-size: 1.25em;">Doctrine (5 minutes)</span><br></br>Create a doctrine project in 5 minutes.<br></br></a></li>
<li><a href="php-lib-10min.html"><span style="white-space: nowrap; font-weight: bold; font-size: 1.25em;">Library (10 minutes)</span><br></br>This tutorial contains some deeper explanations for creating library projects.<br></br></a></li>
<li><a href="php-web-10min.html"><span style="white-space: nowrap; font-weight: bold; font-size: 1.25em;">Website (10 minutes)</span><br></br>This tutorial contains some deeper explanations for creating web projects.<br></br></a></li>
<li><a href="php-zend-10min.html"><span style="white-space: nowrap; font-weight: bold; font-size: 1.25em;">Zend-Framework (10 minutes)</span><br></br>This tutorial contains some deeper explanations for creating zend framework web application projects.<br></br></a></li>
27 pom.xml
View
@@ -25,11 +25,32 @@
<!-- <module>build</module> -->
<!-- normal build cycle -->
- <module>sites</module>
- <module>branches</module>
- <module>tags</module>
</modules>
+ <profiles>
+ <profile>
+ <id>maven-php-include-sites</id>
+ <modules>
+ <module>sites</module>
+ </modules>
+ <activation><activeByDefault>true</activeByDefault></activation>
+ </profile>
+ <profile>
+ <id>maven-php-include-branches</id>
+ <modules>
+ <module>branches</module>
+ </modules>
+ <activation><activeByDefault>true</activeByDefault></activation>
+ </profile>
+ <profile>
+ <id>maven-php-include-tags</id>
+ <modules>
+ <module>tags</module>
+ </modules>
+ <activation><activeByDefault>true</activeByDefault></activation>
+ </profile>
+ </profiles>
+
<url>${phpmavenRootUrl}/var/sites/</url>
<distributionManagement>
44 sites/www.php-maven.org/src/site/xdoc/feed.xml.vm
View
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document>
+ <properties>
+ <author email="christian.wiedemann@key-tec.de">
+ Christian Wiedemann
+ </author>
+ <author email="martin.eisengardt@googlemail.com">
+ Martin Eisengardt
+ </author>
+
+ <title>Feeds</title>
+ <meta name="keyword" content="apache, maven, php"></meta>
+ </properties>
+
+ <body>
+
+<section name="Feeds">
+
+<p>
+ There are various feeds you can subscribe. You can use them to get the latest news.
+</p>
+
+<p>
+ <b><a href="http://www.php-maven.org/rss.xml">Website Feed (RSS)</a></b>: Will report new version tags, will contain the latest major changes in
+ documentation and major project news.
+</p>
+
+<p>
+ <b><a href="https://groups.google.com/group/maven-for-php/feed/rss_v2_0_msgs.xml">Google groups messages (RSS)</a></b>: Will contain the newest 15
+ posts at the google group.
+</p>
+
+<p>
+ <b><a href="https://groups.google.com/group/maven-for-php/feed/rss_v2_0_topics.xml">Google groups topics (RSS)</a></b>: Will contain the newest 15
+ topics at the google group.
+</p>
+
+<p>
+ <b><a href="https://github.com/php-maven/maven-php-plugin/commits/master.atom">Source commits (Atom)</a></b>: Will contain the source code commits.
+</p>
+
+</section>
+</body>
+</document>
2  ...ven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-autoprepend/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0.0-beta-3</version>
</parent>
2  ...maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-bootstrap/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0.0-beta-3</version>
</parent>
2  ...3/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-failing/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0.0-beta-3</version>
</parent>
2  ...3/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-notests/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0.0-beta-3</version>
</parent>
2  ...hp-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-oktests-multiple/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0.0-beta-3</version>
</parent>
2  ...3/maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-oktests/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0.0-beta-3</version>
</parent>
2  ...maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-with-dep1/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0.0-beta-3</version>
</parent>
2  ...maven-php-plugin-test/src/test/resources/org/phpmaven/test/projects/mojos-phpunit/test-with-dep2/pom.xml
View
@@ -9,7 +9,7 @@
<parent>
<groupId>org.phpmaven</groupId>
- <artifactId>maven-php-parent</artifactId>
+ <artifactId>php-parent-pom</artifactId>
<version>2.0.0-beta-3</version>
</parent>
2  tags/2.0.0-beta-3/src/site/xdoc/developer.xml.vm
View
@@ -18,7 +18,7 @@
<ul>
<li>At first you should setup eclipse.
<ul>
- <li>Install at least 1.6 jdk: <a href="http://java.sun.com/">http://www.oracle.com/technetwork/java/javase/downloads/index.html</li>
+ <li>Install at least 1.6 jdk: <a href="http://java.sun.com/">http://www.oracle.com/technetwork/java/javase/downloads/index.html</a></li>
<li>Download eclipse ide for java developers: <a href="http://www.eclipse.org/downloads/">eclipye download url</a>.</li>
<li>After first starting eclipse set the proper jdk at window->preferences->java->installed JRE (eclipse may only see the jre and not the jdk</li>
<li>Install checkstyle plugin: <a href="http://eclipse-cs.sourceforge.net/downloads.html">Install manual</a></li>
13 tags/pom.xml
View
@@ -30,11 +30,20 @@
</distributionManagement>
<modules>
- <module>2.0.0-beta-1</module>
- <module>2.0.0-beta-2</module>
<module>2.0.0-beta-3</module>
</modules>
+ <profiles>
+ <profile>
+ <id>maven-php-include-oldtags</id>
+ <modules>
+ <module>2.0.0-beta-1</module>
+ <module>2.0.0-beta-2</module>
+ </modules>
+ <activation><activeByDefault>true</activeByDefault></activation>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>

No commit comments for this range

Something went wrong with that request. Please try again.