Commit e97deb4f authored by Michael's avatar Michael
Browse files

Merge pull request #219 from Alfresco/revert-215-master 

Revert "Adding integration test profile"
parents 9616129c 3b2e9390

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -12,4 +12,3 @@ pom.xml.next 
release.properties

**.settings

**bin
 
**.DS_Store

archetypes/alfresco-amp-archetype/.classpath

0 → 100644
+8 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<classpath>

	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>

	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>

	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>

	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>

	<classpathentry kind="output" path="target/classes"/>

</classpath>

archetypes/alfresco-amp-archetype/.project

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

	<name>alfresco-amp-archetype</name>

	<comment></comment>

	<projects>

	</projects>

	<buildSpec>

		<buildCommand>

			<name>org.eclipse.jdt.core.javabuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.maven.ide.eclipse.maven2Builder</name>

			<arguments>

			</arguments>

		</buildCommand>

		<buildCommand>

			<name>org.eclipse.m2e.core.maven2Builder</name>

			<arguments>

			</arguments>

		</buildCommand>

	</buildSpec>

	<natures>

		<nature>org.eclipse.m2e.core.maven2Nature</nature>

		<nature>org.eclipse.jdt.core.javanature</nature>

		<nature>org.maven.ide.eclipse.maven2Nature</nature>

	</natures>

</projectDescription>

archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

+0 −18
Original line number Diff line number Diff line
@@ -53,24 +53,6 @@ 
        <include>**/*.xml</include>

      </includes>

    </fileSet>

    <fileSet filtered="false" packaged="false" encoding="UTF-8">

      <directory>src/integration/java</directory>

      <includes>

        <include>**/*.java</include>

      </includes>

    </fileSet>

    <fileSet filtered="false" encoding="UTF-8">

      <directory>src/integration/resources</directory>

      <includes>

        <include>**/*</include>

      </includes>

    </fileSet>

    <fileSet filtered="false" encoding="UTF-8">

      <directory>src/integration/properties</directory>

      <includes>

        <include>**/*</include>

      </includes>

    </fileSet>

    <fileSet encoding="UTF-8">

        <directory></directory>

        <includes>

archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml

+1 −11
Original line number Diff line number Diff line
@@ -73,16 +73,6 @@ 
            <groupId>${alfresco.groupId}</groupId>

            <artifactId>alfresco-repository</artifactId>

        </dependency>

        <dependency>

            <groupId>org.seleniumhq.selenium</groupId>

            <artifactId>selenium-java</artifactId>

            <version>2.39.0</version>

            <exclusions>

                <exclusion>

                    <groupId>org.mortbay.jetty</groupId>

                    <artifactId>servlet-api-2.5</artifactId>

                </exclusion>

            </exclusions>

        </dependency>

    </dependencies>

  

</project>