[maven-release-plugin] prepare release alfresco-sdk-aggregator-2.1.1-beta-2

Merge pull request #326 from binovo/Issue/317
fix issue #317
2026-09-16 18:13:23 +00:00 · 2015-09-28 13:12:03 +01:00 · 2015-09-24 15:15:47 +02:00 · 2015-09-01 09:04:47 +01:00 · 2015-09-01 09:04:41 +01:00 · 2015-09-01 09:29:52 +02:00
61 changed files with 614 additions and 249 deletions
@@ -9,6 +9,10 @@ Developers:
        (gpg --list-key <your email>
             && gpg --armor --export <your email>) >> this file.

+################################################################
+# Gabriele Columbro
+################################################################
+
 pub   4096R/6FE5701E 2012-03-25
 uid                  Gabriele Columbro (VALID CODE SIGNING KEY) <gabriele@apache.org>
 sub   4096R/E97059F3 2012-03-25
@@ -86,4 +90,66 @@ hrGAueS2lH5DUpjZPqClR+txnAK+hVCuFogoWsdsbRHMLkqKqhnQjWnvRrU0ud9j
 ytG/XwLK3RL7LTmPIC9RqlO1U1A3h5Ykw2INH/bB90lBxmydmp/PHpkhjEAEvzGW
 r+ipOwsWpF6kLIHUT2LuPxLqTGQCrqYtJyTp61tE
 =GUM9
+-----END PGP PUBLIC KEY BLOCK-----
+
+################################################################
+# Alfresco Software, Inc - PGP key
+################################################################
+
+pub   4096R/DAD3B670 2014-10-20 [expires: 2015-10-20]
+      Key fingerprint = 6959 A697 47E2 7AC4 E1E7  1636 199D 99B1 DAD3 B670
+uid                  Alfresco Software, Inc (GPG) <info@alfresco.com>
+sub   4096R/A4B70B45 2014-10-20 [expires: 2015-10-20]
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+mQINBFRFM3EBEADveqoXdxufZiP+hK992UJO9OIumDts9SlirI4VviyRlCn/qc3X
+5wzAAsTNRBJjsk3S3O3EfmK79GodIb0ebnQSbv6+EnwPK0uwS0ykoy7JrMUHVBY+
+zI9AwGIe0UpCRXfPH3x0O1Psi1fcKGR/Qs2ouTnCpzDZRq3kFt7/iCXm6t8QpaxE
+y4KNxT/S8MeGydslqgbEA4fCZ6RP9kzFs8tCNyv9WxHkcb0oos/nC2ihJy3HZATO
+A2qeTxS5pf6O1hJuE7XRIRCPTN1j0uSAl4ebDKPn4uANz8MwYcZBz89lWVmP/wEz
+AoN8jWjqb/SstURj+czjXoxhoxMaLDMjdw5RoJsLUmlfp2j9eaFbxmUl103wUL+O
+R+6sk5pXHpvifjeI/AjNTaZe6WVfkgcUqkHmw0GUgdASgBLBDciGd+O4sXr/L/iZ
+wxhdxcubWy4MbKcy7QlcS4Z4FwK6jjPQKjn+7PT3Wexh8SAX0661gntV7Rr/SYIY
+edyRdtLd+SP+TuOn4wQY5x8ahHqGi4PDoSaCMAZ8jbQnbAXXeOlkBuyDm+Z4iGDC
+OQgjvvQufB2ZA1ml9DjtZOWIdgUQfanGaO8TW+V5v+PFvfMkRFIMMyS8WEp6ePT/
+IOBDxUBQ0BZ1BktkQ+Oifi179EyvghpePciUWX5oDf6AfW/QfLhnkVhQPQARAQAB
+tDBBbGZyZXNjbyBTb2Z0d2FyZSwgSW5jIChHUEcpIDxpbmZvQGFsZnJlc2NvLmNv
+bT6JAj4EEwECACgFAlRFM3ECGwMFCQHhM4AGCwkIBwMCBhUIAgkKCwQWAgMBAh4B
+AheAAAoJEBmdmbHa07ZwTtYP/jdMOUFvUqAwaiDBap0+DqyyFgeWfa90b3O6LlAf
+BeKin4lq8TEVL1CCehRSILAgd0nQQYHeJvLwpvZNl4t2TBFk5e/Xd4gHdszum4Ms
+aJ0qc2G61ep5vE5z11Ca2vWLEG1Org+iVtZuMZcsCtPhFjyHE1PRU1s0ApoIXZxt
+z35pgz5PSldPpOk4nuUKIhLLTpNLNd4fgbPiHhyqJloTMsOEycZ+W5Em2Ib2/kxx
+0GIjAy5A9IlezALKengZ4NjHFwcddcP6+2rFgBTY/7KhhGNyOghwSIIJOdp0BQwD
+bSN26e5WpYT+gja44QZ44KdMpOcxH8Qt0lJmjULizxcbYTPMsoPF3Jszm0E5auOQ
+y2cixDEfmioqgJ4KKS6AIXd/yfLEvsGEU1Zz1a1yDQz12ZhzBa/GtoQRhzWErspR
+7kMPiGKQEhQowB7vHfiCmVhx89RWPwZFFyLz92jS11ZGpeBlWF4hMSefQR7sFWLi
+rYw0LOyMyFyz9P60ZKX18LHltxsrsteJA7zARcS0uv112O7wSTX1k44s5fiaWlVR
+Ciuchcp0eTcsYa4Jiz4yZNnJhRi7tnsQJOXYF4IjGAxnJoBLSUUt2uEWtMg09m5F
+vgrCNcc8HFy1hIIHy0l5CaLJY/5x9Z1Lg2dbwVP7+goTRogRGvpdjy7/eMlQEAgm
+HMtsuQINBFRFM3EBEADCohKTxy3JYJ3dPzxhD/76nX0zkyvuhepVXAkpzjhWSx9r
+9RQSB6WLnczlZVriQKVPR6RZ7fn4XhLim3v9e9c188R1WeUvuHWaJXDAvBWFarLu
+y7kd1ZRpS0UWWE+k/WBruT5rEqjpW4Un/7WINsr972Ic7IFiv5ISUC7h/ylym5T1
+w15WRZnMF96tLmMjzGdqJYrbu7Y4ZPYr5VwWnd9hE9Cal3YMMsfcXlIWOzw7BRDO
+aWmMsWyFiVkwCeAZOSYthu4Qdo3bSlGo5C46JuRcdU1ZimZKztC1qlihiju7oWfa
+3hJT/uWFu06IAdcI6lq4yEb+iG73BNUGNMDzpTeWLW7Q3IByZ/e9/DzFJcjsDf5N
+jCzJGxAtEJ28egrZe6/Fk6yBwE0+nzUmOPU3qqi57aFFajfdV89SoQwKG83IpNJl
+L9vbE62Iljm0DNK3VEotw9OMc6B3z6TfatVclqLFTH5Q+4rNcCytpK747loGVJcP
+KFs1FzFj+hW2MkFcnY1JbuaSuyrhPVpg4Z1bjxLVLdlisYm0AL+n+z0tmFO45XJ2
+mS06ckpqFAhk5HOOMOd/9+Qi3p9orE6dFM+TIWnxDphpws43O+FSYM8OJk7saGos
+DNMvm9C0oz07MwMuthkLmSBsWmkZYXrvkUY1lrTdpyqqs11qllBZ1PsRATKeIQAR
+AQABiQIlBBgBAgAPBQJURTNxAhsMBQkB4TOAAAoJEBmdmbHa07ZwQl4P/2FH+4Sa
+JJgaNGoyyo1Oh1Xd1OMHf++V7FpXxHHmgEv6bTz3E8xHTMA7Zm1iBIPGrIo2loKe
+49p3gbGFtvZLLT31Tg+usUN62QntKYOIiztdjsxzTskBgJH+A4Ucz7O1NsN6GQXF
+QgGFlEpWApXCK8ogNp6ntwxGCyOFvZujuJjSFUZcpNEGhOYhYuKvo18qboP3RgVy
+o74FPtPvh3YMz9DLRXeVbhhIq0oejek5z0aOXEjgZipVO4U7uDO5EVcG57jIVfiI
+WM681KHG/Djx64GmSi9wo+P687Ib7+UHSzBTeEm9YVRNNSQFbuvxqq9XhDctkkbZ
+m/QRbQXJFPQJcDOLLH06JNQ+/KvT8uwduiBFs2x77qKrVCxqCQU8XwY+KnyGouf9
+sLdxDZwGoXFbnCyRKFH+fqoIMdcYzIT/VvGswTCNqSOvDxnSNO9REVbdsIJwenqt
+QetRR7SVYKfcyLMCtMek3Fgst85khwP8tIYAEerE+XN04b1FfD3mjqvgBdUY7IDM
+W1NVRTtjlX46ltNvtERO8JGYMqlRW/wpDXQzRxryNY7frXA+fhog2L53cOK/Fwc8
+UcbLubQPkh/6+w4SybT2F8otOB1J8KZ0tzbTd5JxuX0V0AD8OjH+uuN67r5bQBk9
+ARVlLqDOpHP01PW6WUQta2xAQ2mshuQZTX1H
+=3Y/D
 -----END PGP PUBLIC KEY BLOCK-----
@@ -1,89 +1,73 @@
 # [![Alfresco SDK logo](https://github.com/Alfresco/alfresco-sdk/raw/master/src/site/resources/img/alfresco-maven-logo.jpg)](#features) Alfresco SDK

-SDK for Alfresco Development, Testing, packaging and custom project lifecycle management based on Apache Maven. 
+This is the home of the Alfresco SDK. The Alfresco SDK is used by developers to build extensions for the Alfresco content management system. It is based on [Apache Maven](http://maven.apache.org/), compatible with major IDEs and enables Rapid Application Development (RAD) and Test Driven Development (TDD).

-Includes support for rapid and standard development, testing, packaging, versioning and release of your Alfresco integration and extension projects. 
-
-## SDK 2.0.0 available in Maven Central
-
-The SDK 2.0.0 is finally [released in Maven Central](http://search.maven.org/#search|ga|1|alfresco%20sdk). 
-
- *To create a new Alfresco project*: Run a 
-
-```bash
-mvn archetype:generate -Dfilter=org.alfresco:
-```
-
-and use one of the available archetypes (AMP, Share AMP, All in One)
-
- *To use the SDK in your project:*  Add the below parent reference snippet to the existing project (*NOTE*: you might need folder layout changes) to inherit features from Alfresco SDK POM:
-
-```xml
-<parent>
-   <groupId>org.alfresco.maven</groupId>
-   <artifactId>alfresco-sdk-parent</artifactId>
-   <version>2.0.0</version>
-</parent>
-
-```
-## Resources 
-
-### Alfresco Official Docs
-
- Documentation for the SDK on Alfresco Community (latest) is available [here](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html)
-
- Documentation for the SDK on Alfresco Enterprise (5.0) is available [here](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html)
-
-### Developer Documentation
-
-**SDK 2.x**: Full developer (Maven) documentation is available at the [Alfresco SDK site](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-sdk-aggregator/latest/index.html).
-
-
-
-# Check the SDK in action!
-
-For an overview of the SDK potential check out this video:
-
-[![Alfresco SDK 2.x howto](http://img.youtube.com/vi/utYZaVe9Nd0/0.jpg)](https://www.youtube.com/watch?v=utYZaVe9Nd0)
-
-The SDK is composed of:
-
- An [SDK Parent POM](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/poms/alfresco-sdk-parent/index.html) which you can use in your projects to enable rapid Alfresco development features
- An [Alfresco Platform Distribution POM](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-platform-distribution/latest/index.html) which pre-configures versions of Alfresco and common 3rd party dependency libraries, for stability purposes
- A [Maven Alfresco Plugin](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/plugins/alfresco-maven-plugin/index.html) which provides AMP packaging and installation facilities (a la MMT) and other common goals for Alfresco development
- A number of *Maven Archetypes* (sample projects) including:
-	1. [Alfresco Repository AMP Archetype](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/archetypes/alfresco-amp-archetype/index.html)
-	2. [Alfresco Share AMP Archetype](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/archetypes/share-amp-archetype/index.html)
-	3. [Alfresco All-in-One Archetype](https://artifacts.alfresco.com/nexus/content/groups/public/alfresco-lifecycle-aggregator/latest/archetypes/alfresco-allinone-archetype/index.html)
-
-
-### Samples 
-
-Advanced sample projects are maintained by @ohej in the [Alfresco SDK Samples project](https://github.com/Alfresco/alfresco-sdk-samples/).
-
-
-### Contribute
-
-Report issues (and contribute!) [here](https://github.com/Alfresco/alfresco-sdk/issues?milestone=1&state=open). You can also join the [Alfresco list on Google Groups](https://groups.google.com/forum/#!forum/maven-alfresco).
-
-## Maven Repositories
-
-The Alfresco SDK is released in Maven Central as of version 2.0-beta-1. 
-
-Alfresco (Community and Enterprise) artifacts are instead hosted in the [Alfresco Artifacts Repository](https://artifacts.alfresco.com/nexus/). 
-
-Alfresco Community artifacts (JARs, WARs, AMPs, poms) and SDK artifacts are publicly available. 
-
-for Enterprise and Premiere licensed software access you need to get credential via the Alfresco Enterprise Support. See [public docs](http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html) or [this KB (login required)](https://myalfresco.force.com/support/articles/en_US/Technical_Article/Where-can-I-find-the-repository-for-Enterprise-Maven-artifacts) for more details.
-
-## License and Support
-This project is released under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). It's a community driven project which is supported for Alfresco Development (please refere to the official [Alfresco Documentation](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html) for supported features.
+## License
+This project is released under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). If you are an Enterprise customer check the [Support](#alfresco-enterprise-customers-and-partners-support) section.

 ## News
- 2014-12-20: SDK 2.0.0 in staging. If you want early access to the release candidate build and want to participate to the testing process check [this page](https://github.com/Alfresco/alfresco-sdk/wiki/SDK-Supported-Features-and-Test-plan) and report issues [here](https://github.com/Alfresco/alfresco-sdk/issues).
- 2014-09-10: SDK 2.0.0-beta-4 released to Maven Central and in the [Archetype Catalog](http://repo1.maven.org/maven2/archetype-catalog.xml)!
- 2014-09-09: SDK 2.0.0-beta-3 released to Maven Central
- 2014-08-30: SDK 2.0.0-beta-1 and 2.0.0-beta-2 available in [Maven Central](http://search.maven.org/#search|ga|1|org.alfresco.maven)
+- 2015-05-20: SDK 2.1.0 released to Maven Central. Docs for [Community](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html), [Enterprise](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html), [Release notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest/github-report.html)
+- 2014-12-23: SDK 2.0.0 release to Maven Central. [Docs](http://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html), [Release Notes](https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/archive/2.0.0/github-report.htm)  
 - 2014-08-22: First SNAPSHOT of SDK 2.0.0 in the [OSS Sonatype Repository](https://oss.sonatype.org/content/repositories/snapshots/org/alfresco/maven/alfresco-sdk-parent/2.0.0-SNAPSHOT/)!
- 2014-07: Project fully migrated from [Google Code](https://code.google.com/p/maven-alfresco-archetypes), including tags, branches, issues. Allow a little time for a full cleanup of issue labels and to sort repository permissions. Please update obsolete references and bear with us as we update Alfresco Documentation to this change.
+- 2014-07: Project fully migrated from [Google Code](https://code.google.com/p/maven-alfresco-archetypes).
+
+## User Getting Started
+
+### Latest Documentation
+To get started with Alfresco SDK 2.1 (latest) visit the offical Alfresco Documentation for:
+
+- [Alfresco Community 5.0.d and above](http://docs.alfresco.com/community/concepts/alfresco-sdk-intro.html)
+- [Alfresco Enterprise 5.0.1 and above](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-intro.html)
+
+#### Previous versions Documentation
+- Documentation for [Alfresco SDK 2.0](http://docs.alfresco.com/sdk2.0/concepts/alfresco-sdk-intro.html) (compatible with Alfresco 5.0.d Community and 5.0.0 Enterprise)
+- Documentation for [Alfresco SDK 1.1.1](http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-intro.html) (compatible with Alfresco 4.2)
+
+### Samples 
+Sample extension projects that use the SDK, maintained by @ohej in the [Alfresco SDK Samples project](https://github.com/Alfresco/alfresco-sdk-samples/).
+
+### Command reference
+A list of supported features and commands, explanation of Maven profiles and commands is kept in the [Alfresco Official Docs](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-cmd-reference.html).
+
+### Want to get up to speed quickly in Eclipse? Check out this video!
+
+[![Alfresco SDK 2.1 howto](http://img.youtube.com/vi/utYZaVe9Nd0/0.jpg)](https://www.youtube.com/watch?v=utYZaVe9Nd0)
+
+## Reporting Issues and Community Support
+Report issues (and contribute!) [here](https://github.com/Alfresco/alfresco-sdk/issues?milestone=1&state=open). You can also join the [Alfresco list on Google Groups](https://groups.google.com/forum/#!forum/maven-alfresco) or join us on the [IRC Channel](http://chat.alfresco.com/). 
+
+## Alfresco Enterprise Customers and Partners Support
+If you are an Alfresco Customer please check the [SDK Support status](http://www.alfresco.com/services/subscription/technical-support/product-support-status) for the version you are using and the [Compatibily Matrix](http://docs.alfresco.com/community/concepts/alfresco-sdk-compatibility.html) for the SDK / Alfresco compatibility. If your version is in Limited or Full Support, you can raise issues via the [Support Portal](http://support.alfresco.com).
+
+## Maven repositories
+- As of version 2.0-beta-1, The Alfresco SDK is released in [Maven Central](http://search.maven.org/#search|ga|1|alfresco-sdk). Previous versions are available in the [Alfresco Artifacts Repository](https://artifacts.alfresco.com/).
+- Alfresco (Community and Enterprise) artifacts are  hosted in the [Alfresco Artifacts Repository](https://artifacts.alfresco.com/).
+- Alfresco Community artifacts (JARs, WARs, AMPs, poms) and SDK artifacts are publicly available.
+
+*NOTE:* For Enterprise and Premiere licensed software access you need to get credential via the Alfresco Enterprise Support. See [Maven Alfresco Enterprise setup](http://docs.alfresco.com/5.0/concepts/alfresco-sdk-using-enterprise-edition.html).
+
+### Alfresco Artifacts Repository
+
+#### Alfresco Releases
+You can use the following snippet in your pom.xml to access releases on Alfresco Artifact repository:
+
+```xml
+<repository>
+    <id>alfresco-public</id>
+    <url>https://artifacts.alfresco.com/nexus/content/groups/public</url>
+</repository>
+```
+
+#### SDK Snapshots
+To test new unreleased (unsupported) features, you can use the following snippet in your pom.xml to access SDK nightlies (SNAPSHOTS) from the OSS Sonatype repository:
+
+```xml
+<repository>
+    <id>oss-sonatype-snapshots</id>
+    <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+</repository>
+```
+
+## For Developers that want to contribute to the SDK
+See the [Developers Wiki page](https://github.com/Alfresco/alfresco-sdk/wiki/Developer-Wiki).

@@ -11,7 +11,7 @@
  <parent>
    <groupId>org.alfresco.maven</groupId>
    <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.1.0-beta-1</version>
+    <version>2.1.1-beta-2</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>
  
@@ -68,11 +68,27 @@
                        <include>**/*.java</include>
                    </includes>
                </fileSet>
+                <fileSet filtered="true" packaged="false" encoding="UTF-8">
+                    <directory>src/main/amp/config/alfresco/web-extension</directory>
+                    <includes>
+                        <include>__artifactId__-slingshot-application-context.xml</include>
+                    </includes>
+                </fileSet>
+                <fileSet filtered="true" packaged="false" encoding="UTF-8">
+                    <directory>src/main/amp/config/alfresco/web-extension/site-data/extensions</directory>
+                    <includes>
+                        <include>__artifactId__-example-widgets.xml</include>
+                    </includes>
+                </fileSet>
                <fileSet encoding="UTF-8" filtered="false">
                    <directory>src/main/amp</directory>
                    <includes>
                        <include>**</include>
                    </includes>
+                    <excludes>
+                        <exclude>**/__artifactId__-slingshot-application-context.xml</exclude>
+                        <exclude>**/__artifactId__-example-widgets.xml</exclude>
+                    </excludes>
                </fileSet>
                <fileSet filtered="true" packaged="false" encoding="UTF-8">
                    <directory>src/test/resources</directory>
@@ -97,11 +113,20 @@
                        <include>**/*.properties</include>
                    </includes>
                </fileSet>
+                <fileSet encoding="UTF-8" filtered="true">
+                    <directory>src/main/resources/alfresco/extension</directory>
+                    <includes>
+                        <include>dev-log4j.properties</include>
+                    </includes>
+                </fileSet>
                <fileSet encoding="UTF-8" filtered="false">
                    <directory>src/main/resources</directory>
                    <includes>
                        <include>**</include>
                    </includes>
+                    <excludes>
+                        <exclude>**/dev-log4j.properties</exclude>
+                    </excludes>
                </fileSet>
            </fileSets>
        </module>
@@ -117,6 +142,12 @@
                        <include>**</include>
                    </includes>
                </fileSet>
+                <fileSet filtered="true" packaged="false" encoding="UTF-8">
+                    <directory>src/test/resources</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
            </fileSets>
        </module>

@@ -66,6 +66,10 @@
                <groupId>net.alchim31.maven</groupId>
                <artifactId>yuicompressor-maven-plugin</artifactId>
            </plugin>
+            <plugin>
+                <groupId>org.alfresco.maven.plugin</groupId>
+                <artifactId>alfresco-maven-plugin</artifactId>
+            </plugin>
        </plugins>
    </build>

@@ -1,5 +1,5 @@
 <webscript>
-    <shortname>Javascript Sample Webscript</shortname>
+    <shortname>Hello World Sample Webscript</shortname>
    <description>Hands back a greeting</description>
    <url>/sample/helloworld</url>
    <authentication>user</authentication>
@@ -0,0 +1 @@
+Message: ${fromJS} ${fromJava}
@@ -0,0 +1 @@
+model["fromJS"] = "Hello World from JS!";
@@ -1 +0,0 @@
-Message: ${message}
@@ -1 +0,0 @@
-model["message"] = "Hello World!";
@@ -23,16 +23,20 @@
    
    <!-- A simple class that is initialized by Spring -->
    <bean id="${package}.exampleBean" class="${package}.demoamp.Demo" init-method="init" />
-    
-    <!-- A simple module component that will be executed once -->
+
+    <!-- A simple module component that will be executed once.
+         Note. this module component will only be executed once, and then there will be an entry for it in the Repo.
+         So doing for example $ mvn clean install -Prun twice will only execute this component the first time.
+         You need to remove /alf_data_dev for it to be executed again. -->
    <bean id="${package}.exampleComponent" class="${package}.demoamp.DemoComponent" parent="module.baseComponent" >
-        <property name="moduleId" value="${project.artifactId}" />  <!-- See module.properties -->
+        <property name="moduleId" value="${artifactId}" />  <!-- See module.properties -->
        <property name="name" value="exampleComponent" />
        <property name="description" value="A demonstration component" />
-        <property name="sinceVersion" value="2.0" />
-        <property name="appliesFromVersion" value="2.0" />
+        <property name="sinceVersion" value="1.0" />
+        <property name="appliesFromVersion" value="1.0" />
        <property name="nodeService" ref="NodeService" />
        <property name="nodeLocatorService" ref="nodeLocatorService" />
    </bean>
+
    
 </beans>
@@ -0,0 +1,27 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+<!--
+	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.
+-->
+<beans>
+	<bean id="webscript.helloworld.get"
+		  class="${package}.demoamp.HelloWorldWebScript"
+		  parent="webscript">
+	</bean>
+</beans>
@@ -23,5 +23,6 @@
    <!-- This is filtered by Maven at build time, so that module name is single sourced. -->
    <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />
    <import resource="classpath:alfresco/module/${project.artifactId}/context/bootstrap-context.xml" />
+	<import resource="classpath:alfresco/module/${project.artifactId}/context/webscript-context.xml" />

 </beans>
@@ -0,0 +1,43 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/*
+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 ${package}.demoamp;
+
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A demonstration Java controller for the Hello World Web Script.
+ *
+ * @author martin.bergljung@alfresco.com
+ * @since 2.1.0
+ */
+public class HelloWorldWebScript extends DeclarativeWebScript {
+    protected Map<String, Object> executeImpl(
+            WebScriptRequest req, Status status, Cache cache) {
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("fromJava", "HelloFromJava");
+        return model;
+    }
+}
@@ -24,6 +24,14 @@
        <version>${version}</version>
    </parent>

+    <properties>
+        <!-- During development we set log root level to Debug,
+            this will be applicable to the log configuration in
+            repo/src/main/resources/alfresco/extension/dev-log4j.properties,
+            such as DemoComponent logging. -->
+        <app.log.root.level>DEBUG</app.log.root.level>
+    </properties>
+
    <dependencies>
        <dependency>
            <groupId>${alfresco.groupId}</groupId>
@@ -1,2 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 # You can add here custom log4j classes. This will be merged with the main log4j.properties
-# See http://wiki.alfresco.com/wiki/Developing_an_Alfresco_Module#Best_Log4j_Configuration_Practices
+# See http://wiki.alfresco.com/wiki/Developing_an_Alfresco_Module#Best_Log4j_Configuration_Practices
+log4j.logger.${package}.demoamp.DemoComponent=${app.log.root.level}
@@ -14,6 +14,11 @@
    <!-- Pick up static resource files from AMPs and other directories (this should not include docBase) -->
    <Resources className="org.apache.naming.resources.VirtualDirContext"
               extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/repo-amp/web" />
+    <!-- IMPORTANT! The extraResourcePaths string need to be on one continues line, so if we add another Repo AMP,
+                    it would look something like this:
+    <Resources className="org.apache.naming.resources.VirtualDirContext"
+               extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/repo-amp/web,/=${project.parent.basedir}/component-a-repo/target/component-a-repo/web" />
+    -->

    <!-- Configure where the Alfresco (alfresco.war) web application can load classes, test classes, and config files -->
    <!-- Setup the virtual class path like this:
@@ -25,7 +30,9 @@
    -->
    <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
            searchVirtualFirst="true"
-            virtualClasspath="${project.parent.basedir}/repo-amp/target/classes;${project.parent.basedir}/repo-amp/target/repo-amp/config;${project.parent.basedir}/repo-amp/target/test-classes" />
+            virtualClasspath="${project.parent.basedir}/repo-amp/target/classes;
+            ${project.parent.basedir}/repo-amp/target/repo-amp/config;
+            ${project.parent.basedir}/repo-amp/target/test-classes" />

    <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
    <JarScanner scanAllDirectories="true" />
@@ -11,18 +11,28 @@
         (this should not include docBase) -->
    <Resources className="org.apache.naming.resources.VirtualDirContext"
               extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web" />
+    <!-- IMPORTANT! The extraResourcePaths string need to be on one continues line, so if we add another Share AMP,
+                    it would look something like this:
+    <Resources className="org.apache.naming.resources.VirtualDirContext"
+               extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web,/=${project.parent.basedir}/component-a-share/target/component-a-share/web" />
+               -->

-    <!-- Configure where the Share (share.war) web application can load classes, test classes, and config -->
+    <!-- Configure where the Share (share.war) web application can load classes, config, and test classes (in that order) -->
    <!-- Setup the virtual class path like this:
-         1) target/classes
-         2) target/${project.build.finalName}/config
-         3) target/test-classes
+         1) share-amp/target/classes
+         2) share-amp/target/${project.build.finalName}/config
+         3) share-amp/target/test-classes
+         4)     Add other AMP paths here....
+         5) share/target/test-classes              (loads the share-config-custom.xml used during test runs)

         This way mvn compile can be invoked and all changes will be picked up
    -->
    <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
            searchVirtualFirst="true"
-            virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/share-amp/config;${project.parent.basedir}/share-amp/target/test-classes" />
+            virtualClasspath="${project.parent.basedir}/share-amp/target/classes;
+            ${project.parent.basedir}/share-amp/target/share-amp/config;
+            ${project.parent.basedir}/share-amp/target/test-classes;
+            ${project.parent.basedir}/share/target/test-classes" />

    <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
    <JarScanner scanAllDirectories="true" />
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Context>
-    <Environment name="solr/home"        type="java.lang.String" value="${project.parent.basedir}/alf_data_dev/solr4/config/" override="true"/>
-    <Environment name="solr/model/dir"   type="java.lang.String" value="${project.parent.basedir}/alf_data_dev/solr4/config/alfrescoModels/" override="true"/>
-    <Environment name="solr/content/dir" type="java.lang.String" value="${project.parent.basedir}/alf_data_dev/solr4/data/content/" override="true"/>
+    <Environment name="solr/home"        type="java.lang.String" value="${alfresco.solr.home.dir}/" override="true"/>
+    <Environment name="solr/model/dir"   type="java.lang.String" value="${alfresco.solr.home.dir}/alfrescoModels/" override="true"/>
+    <Environment name="solr/content/dir" type="java.lang.String" value="${alfresco.solr.data.dir}/content/" override="true"/>

    <!-- Pick up static resource files from any Solr extensions, being it a JAR or an AMP,
         by default there are no extensions, just the standard Solr webapp files.
@@ -23,9 +23,6 @@
             Allowed values: alfresco | share. In this case it's configured to use OOTB share -->
        <app.amp.client.war.artifactId>share</app.amp.client.war.artifactId>

-        <!-- Used in share-config-custom.xml. By default points to standard location of Alfresco Repository -->
-        <alfresco.repo.url>http://localhost:8080/alfresco</alfresco.repo.url>
-
        <!-- Defines the log level used in log4j.properties -->
        <app.log.root.level>WARN</app.log.root.level>
    </properties>
@@ -88,6 +85,7 @@
            <groupId>org.seleniumhq.selenium</groupId>
            <artifactId>selenium-java</artifactId>
            <version>2.45.0-alfresco</version>
+            <scope>test</scope>
        </dependency>
        <!-- Test NG is defined with test scope in share-po, so need it here too -->
        <!-- Alfresco code creates a wrapper around Test NG -->
@@ -1,11 +1,11 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
 <?xml version='1.0' encoding='UTF-8'?>
 <beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:hz="http://www.hazelcast.com/schema/spring"
       xsi:schemaLocation="http://www.springframework.org/schema/beans
-                http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                http://www.hazelcast.com/schema/spring
-                http://www.hazelcast.com/schema/spring/hazelcast-spring-2.4.xsd">
+                http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
   
   <!--
    Define beans related to this Share extension here, such as
@@ -16,12 +16,12 @@
            placed in the alfresco-allinone/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml file
   -->

-   <!-- Add extension specific messages and labels -->
-   <bean id="com.mycompany.share-amp.resources"
+   <!-- Add module specific messages and labels -->
+   <bean id="${package}.${artifactId}.resources"
         class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
      <property name="resourceBundles">
         <list>
-            <value>alfresco.messages.custom</value>
+            <value>alfresco.web-extension.messages.${artifactId}</value>
         </list>
      </property>
   </bean>
@@ -1,7 +1,10 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
 <extension>
  <modules>
    <module>
-      <id>Example Aikau Widgets</id>
+      <id>${artifactId} - Example Aikau Widgets</id>
      <version>1.0</version>
      <auto-deploy>true</auto-deploy>
      <configurations>
@@ -1,4 +1,6 @@
-## If you are overriding out-of-the-box Alfresco web scripts put these files here.
-## If you are defining new web scripts add them under resources/alfresco/site-webscripts.
+## If you are overriding out-of-the-box Alfresco web scripts, put these files here
+## in the correct org.alfresco... package.
+## If you are defining a new custom web script, add it under
+## resources/alfresco/web-extension/site-webscripts/{your domain path}.
 ##

@@ -13,6 +13,12 @@
        <version>${version}</version>
    </parent>

+    <properties>
+        <!-- Used in share-config-custom.xml when testing.
+             By default points to standard location (local) of Alfresco Repository -->
+        <alfresco.repo.url>http://localhost:8080/alfresco</alfresco.repo.url>
+    </properties>
+
    <dependencies>
        <dependency>
            <groupId>${alfresco.groupId}</groupId>
@@ -9,11 +9,15 @@
            </autowire>

            <!--
+                 We don't need to do this when we have the new refresh mojos in the Alfresco plug-in.
+
                 If resource caching has been disabled then all the dependency caches will be cleared
                 before processing the Aikau jsonModel request...
                    (i.e. this.dojoDependencyHandler.clearCaches() )
+
+                 For more information see the Aikau source code: https://github.com/Alfresco/Aikau
            -->
-            <disable-resource-caching>true</disable-resource-caching>
+            <disable-resource-caching>false</disable-resource-caching>
        </web-framework>
    </config>

@@ -69,6 +69,30 @@
                        </executions>
                    </plugin>

+                    <!-- For windows paths, convert single \ to / for the ${alfresco.solr.data.dir} path,
+                         by default it will be c:\bla\, we need forward slash or double backslash. -->
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>build-helper-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>regexp-property</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>regex-property</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <name>solrDataDir</name>
+                            <value>${alfresco.solr.data.dir}</value>
+                            <regex>\\</regex>
+                            <replacement>/</replacement>
+                            <failIfNoMatch>false</failIfNoMatch>
+                        </configuration>
+                    </plugin>
+
+
                    <!-- Run the goal replace and update configuration files for the
                         Solr cores to reflect our build structure -->
                    <plugin>
@@ -90,21 +114,9 @@
                                <include>${alfresco.solr.home.dir}/workspace-SpacesStore/conf/solrcore.properties</include>
                            </includes>
                            <replacements>
-                                <replacement>
-                                    <token>@@ALFRESCO_SOLR4_DIR@@</token>
-                                    <value>${alfresco.solr.home.dir}/</value>
-                                </replacement>
-                                <replacement>
-                                    <token>@@ALFRESCO_SOLR4_MODEL_DIR@@</token>
-                                    <value>${alfresco.solr.home.dir}/alfrescoModels/</value>
-                                </replacement>
-                                <replacement>
-                                    <token>@@ALFRESCO_SOLR4_CONTENT_DIR@@</token>
-                                    <value>${alfresco.solr.data.dir}/content/</value>
-                                </replacement>
                                <replacement>
                                    <token>@@ALFRESCO_SOLR4_DATA_DIR@@</token>
-                                    <value>${alfresco.solr.data.dir}/index</value>
+                                    <value>${solrDataDir}/index</value>
                                </replacement>
                            </replacements>
                        </configuration>
@@ -12,7 +12,7 @@
  <parent>
    <groupId>org.alfresco.maven</groupId>
    <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.1.0-beta-1</version>
+    <version>2.1.1-beta-2</version>
    <relativePath>../../pom.xml</relativePath>
  </parent>

@@ -29,8 +29,15 @@
            </includes>
            <excludes>
                <exclude>**/*-context.xml</exclude>
+                <exclude>**/log4j.properties</exclude>
            </excludes>
        </fileSet>
+        <fileSet encoding="UTF-8" filtered="true">
+            <directory>src/main/amp/config/alfresco/module/__artifactId__</directory>
+            <includes>
+                <include>log4j.properties</include>
+            </includes>
+        </fileSet>
        <fileSet encoding="UTF-8" filtered="true" packaged="false">
            <directory>src/main/amp</directory>
            <includes>
@@ -1,5 +1,5 @@
 <webscript>
-    <shortname>Javascript Sample Webscript</shortname>
+    <shortname>Hello World Sample Webscript</shortname>
    <description>Hands back a greeting</description>
    <url>/sample/helloworld</url>
    <authentication>user</authentication>
@@ -0,0 +1 @@
+Message: ${fromJS} ${fromJava}
@@ -0,0 +1 @@
+model["fromJS"] = "Hello World from JS!";
@@ -1 +0,0 @@
-Message: ${message}
@@ -1 +0,0 @@
-model["message"] = "Hello World!";
@@ -24,15 +24,18 @@
    <!-- A simple class that is initialized by Spring -->
    <bean id="${package}.exampleBean" class="${package}.demoamp.Demo" init-method="init" />

-    <!-- A simple module component that will be executed once -->
+    <!-- A simple module component that will be executed once.
+        Note. this module component will only be executed once, and then there will be an entry for it in the Repo.
+        So doing for example $ mvn clean install -Pamp-to-war twice will only execute this component the first time.
+        You need to remove /alf_data_dev for it to be executed again. -->
    <bean id="${package}.exampleComponent" class="${package}.demoamp.DemoComponent" parent="module.baseComponent" >
-        <property name="moduleId" value="${project.artifactId}" />  <!-- See module.properties -->
+        <property name="moduleId" value="${artifactId}" />  <!-- See module.properties -->
        <property name="name" value="exampleComponent" />
        <property name="description" value="A demonstration component" />
-        <property name="sinceVersion" value="2.0" />
-        <property name="appliesFromVersion" value="2.0" />
+        <property name="sinceVersion" value="1.0" />
+        <property name="appliesFromVersion" value="1.0" />
        <property name="nodeService" ref="NodeService" />
        <property name="nodeLocatorService" ref="nodeLocatorService" />
    </bean>
-    
+
 </beans>
@@ -0,0 +1,27 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+<!--
+	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.
+-->
+<beans>
+	<bean id="webscript.helloworld.get"
+		  class="${package}.demoamp.HelloWorldWebScript"
+		  parent="webscript">
+	</bean>
+</beans>
@@ -1,3 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
 # 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.
@@ -37,4 +40,4 @@
 #       those in the webapp's main log4j.properties.
 #    
 #-----------------------------------------------------------------------
-log4j.logger.org.alfresco.demoamp.DemoComponent=${module.log.level}
+log4j.logger.${package}.demoamp.DemoComponent=debug
@@ -21,5 +21,6 @@
 	<!-- This is filtered by Maven at build time, so that module name is single sourced. -->
    <import resource="classpath:alfresco/module/${project.artifactId}/context/service-context.xml" />
    <import resource="classpath:alfresco/module/${project.artifactId}/context/bootstrap-context.xml" />
-    
+	<import resource="classpath:alfresco/module/${project.artifactId}/context/webscript-context.xml" />
+
 </beans>
@@ -0,0 +1,43 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+/*
+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 ${package}.demoamp;
+
+import org.springframework.extensions.webscripts.Cache;
+import org.springframework.extensions.webscripts.DeclarativeWebScript;
+import org.springframework.extensions.webscripts.Status;
+import org.springframework.extensions.webscripts.WebScriptRequest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A demonstration Java controller for the Hello World Web Script.
+ *
+ * @author martin.bergljung@alfresco.com
+ * @since 2.1.0
+ */
+public class HelloWorldWebScript extends DeclarativeWebScript {
+    protected Map<String, Object> executeImpl(
+            WebScriptRequest req, Status status, Cache cache) {
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("fromJava", "HelloFromJava");
+        return model;
+    }
+}
@@ -14,7 +14,7 @@
    <parent>
        <groupId>org.alfresco.maven</groupId>
        <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>2.1.0-beta-1</version>
+        <version>2.1.1-beta-2</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -22,11 +22,27 @@
                <include>**/*.java</include>
            </includes>
        </fileSet>
+        <fileSet filtered="true" packaged="false" encoding="UTF-8">
+            <directory>src/main/amp/config/alfresco/web-extension</directory>
+            <includes>
+                <include>__artifactId__-slingshot-application-context.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet filtered="true" packaged="false" encoding="UTF-8">
+            <directory>src/main/amp/config/alfresco/web-extension/site-data/extensions</directory>
+            <includes>
+                <include>__artifactId__-example-widgets.xml</include>
+            </includes>
+        </fileSet>
        <fileSet encoding="UTF-8" filtered="false">
            <directory>src/main/amp</directory>
            <includes>
                <include>**</include>
            </includes>
+            <excludes>
+                <exclude>**/__artifactId__-slingshot-application-context.xml</exclude>
+                <exclude>**/__artifactId__-example-widgets.xml</exclude>
+            </excludes>
        </fileSet>
        <fileSet encoding="UTF-8" filtered="false">
            <directory>src/test/resources</directory>
@@ -0,0 +1,29 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+    <!--
+     Define beans related to this Share extension here, such as
+      evaluators and resource bootstrapping.
+
+      Note. Any configuration related to the whole Share.war webapp
+            (i.e. not specific to this share extension) should be
+             placed in the tomcat/shared/classes/alfresco/web-extension/custom-slingshot-application-context.xml file
+    -->
+
+    <!-- Add module specific messages and labels -->
+    <bean id="${package}.${artifactId}.resources"
+          class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
+        <property name="resourceBundles">
+            <list>
+                <value>alfresco.web-extension.messages.${artifactId}</value>
+            </list>
+        </property>
+    </bean>
+
+</beans>
@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:hz="http://www.hazelcast.com/schema/spring"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-                http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-                http://www.hazelcast.com/schema/spring
-                http://www.hazelcast.com/schema/spring/hazelcast-spring-2.4.xsd">
-   
-   <!--
-    Define beans related to this Share extension here, such as
-     evaluators and resource bootstrapping.
-     
-     Note. Any configuration related to the whole Share.war webapp 
-           (i.e. not specific to this share extension) should be
-            placed in the environment specific config:
-             alfresco/tomcat/shared/classes/alfresco/web-extension/custom-slingshot-application-context.xml file
-   -->
-
-   <!-- Add extension specific messages and labels -->
-   <bean id="com.mycompany.share-amp.resources"
-         class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent">
-      <property name="resourceBundles">
-         <list>
-            <value>alfresco.messages.custom</value>
-         </list>
-      </property>
-   </bean>
-
-</beans>
@@ -1,7 +1,10 @@
+#set($symbol_pound='#')
+#set($symbol_dollar='$')
+#set($symbol_escape='\' )
 <extension>
  <modules>
    <module>
-      <id>Example Aikau Widgets</id>
+      <id>${artifactId} - Example Aikau Widgets</id>
      <version>1.0</version>
      <auto-deploy>true</auto-deploy>
      <configurations>
@@ -1,4 +1,6 @@
-## If you are overriding out-of-the-box Alfresco web scripts put these files here.
-## If you are defining new web scripts add them under resources/alfresco/site-webscripts.
+## If you are overriding out-of-the-box Alfresco web scripts, put these files here
+## in the correct org.alfresco... package.
+## If you are defining a new custom web script, add it under
+## resources/alfresco/web-extension/site-webscripts/{your domain path}.
 ##

@@ -9,11 +9,15 @@
            </autowire>

            <!--
+                 We don't need to do this when we have the new refresh mojos in the Alfresco plug-in.
+
                 If resource caching has been disabled then all the dependency caches will be cleared
                 before processing the Aikau jsonModel request...
                    (i.e. this.dojoDependencyHandler.clearCaches() )
+
+                 For more information see the Aikau source code: https://github.com/Alfresco/Aikau
            -->
-            <disable-resource-caching>true</disable-resource-caching>
+            <disable-resource-caching>false</disable-resource-caching>
        </web-framework>
    </config>

@@ -11,7 +11,7 @@
  <Resources className="org.apache.naming.resources.VirtualDirContext"
    extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" />

-
+  <!-- Configure where the Share (share.war) web application can load classes, test classes, and config -->
  <!-- Setup the virtual class path like this:
       1) target/classes
       2) target/${project.build.finalName}/config
@@ -9,7 +9,7 @@
  <parent>
      <groupId>org.alfresco.maven</groupId>
      <artifactId>alfresco-sdk-aggregator</artifactId>
-      <version>2.1.0-beta-1</version>
+      <version>2.1.1-beta-2</version>
      <relativePath>../../pom.xml</relativePath>
  </parent>

@@ -8,21 +8,12 @@
  <parent>
      <groupId>org.alfresco.maven</groupId>
      <artifactId>alfresco-sdk-aggregator</artifactId>
-      <version>2.1.0-beta-1</version>
+      <version>2.1.1-beta-2</version>
      <relativePath>../../pom.xml</relativePath>
  </parent>

  <build>
    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
-        <configuration>
-            <source>1.7</source>
-            <target>1.7</target>
-        </configuration>
-      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-plugin-plugin</artifactId>
@@ -67,58 +67,53 @@ public abstract class AbstractRefreshWebappMojo extends AbstractMojo {
     * repo  - Forces only to refresh repo
     * none - Disables refreshing web scripts
     */
-    @Parameter(property = "maven.alfresco.refreshMode", defaultValue = "auto")
+    @Parameter(property = "maven.alfresco.refresh.mode", defaultValue = "auto")
    protected String refreshMode;

    /**
     * The hostname for where the Alfresco Tomcat server is running.
     */
-    @Parameter(property = "maven.alfresco.refreshHost", defaultValue = "localhost")
+    @Parameter(property = "maven.alfresco.refresh.host", defaultValue = "localhost")
    protected String refreshHost;

    /**
     * The port number for where the Alfresco Tomcat server is running.
     */
-    @Parameter(property = "maven.alfresco.refreshPort", defaultValue = "${maven.tomcat.port}")
+    @Parameter(property = "maven.alfresco.refresh.port", defaultValue = "${maven.tomcat.port}")
    private String refreshPort;

    /**
     * The username for authenticating against Alfresco Repo.
     */
-    @Parameter(property = "maven.alfresco.refreshUsername", defaultValue = "admin")
+    @Parameter(property = "maven.alfresco.refresh.username", defaultValue = "admin")
    private String refreshUsername;

    /**
     * The password for authenticating against Alfresco Repo.
     */
-    @Parameter(property = "maven.alfresco.refreshPassword", defaultValue = "admin")
+    @Parameter(property = "maven.alfresco.refresh.password", defaultValue = "admin")
    protected String refreshPassword;

    /**
     * The URL to send the POST to when you want to refresh Alfresco Repo Web Scripts container.
     */
-    @Parameter(property = "maven.alfresco.refreshRepoUrl", defaultValue = "/alfresco/service/index")
+    @Parameter(property = "maven.alfresco.refresh.repoUrl", defaultValue = "/alfresco/service/index")
    protected String refreshRepoUrl;


    /**
     * The URL to send the POST to when you want to refresh Alfresco Share Spring Surf Web Scripts container.
     */
-    @Parameter(property = "maven.alfresco.refreshShareUrl", defaultValue = "/share/page/index")
+    @Parameter(property = "maven.alfresco.refresh.shareUrl", defaultValue = "/share/page/index")
    protected String refreshShareUrl;

    /**
     * The URL to send the POST to when you want to clear dependency caches for the Alfresco Share webapp.
     */
-    @Parameter(property = "maven.alfresco.clearCacheShareUrl", defaultValue = "/share/page/caches/dependency/clear")
+    @Parameter(property = "maven.alfresco.refresh.clearCacheShareUrl", defaultValue = "/share/page/caches/dependency/clear")
    protected String clearCacheShareUrl;


-    /**
-     * The Clear Dependency Caches URL to call, currently only applicable to Share.
-     */
-    protected String clearDependencyCachesUrl;
-
    /**
     * The name of the web application we are refreshing, just for logging purpose
     */
@@ -84,6 +84,7 @@ public class InstallMojo extends AbstractMojo {
    @Override
    public void execute() throws MojoExecutionException, MojoFailureException {
        if (skipAmpInstallation) {
+        	getLog().info("AMP Installation is skipped via configuration");
            return;
        }
        // Checks appropriate input params are in place
@@ -98,19 +99,25 @@ public class InstallMojo extends AbstractMojo {
        if(ampLocation.isDirectory())
        {
            try {
-                mmt.installModules(ampLocation.getAbsolutePath(),
+            	getLog().info("Installing all AMPs from directory " + ampLocation.getAbsolutePath() + " into WAR/exploded webapp at " + warLocation.getAbsolutePath());
+                
+            	mmt.installModules(ampLocation.getAbsolutePath(),
                        warLocation.getAbsolutePath(), false, // preview
                        force, // force install
                        backup); // backup
+                getLog().info("AMPs installed successfully");
+                
            } catch (IOException e) {
                throw new MojoExecutionException("ampLocation " + ampLocation.getAbsolutePath() + " did not contain AMP files - AMP installation cannot proceed");
            } // backup
        } else if(ampLocation.isFile())
        {
+        	getLog().info("Installing AMP " + ampLocation.getAbsolutePath() + " into WAR/exploded webapp at " + warLocation.getAbsolutePath());
            mmt.installModule(ampLocation.getAbsolutePath(),
                    warLocation.getAbsolutePath(), false, // preview
                    force, // force install
                    backup); // backup
+            getLog().info("AMP installed successfully");
        } else
        {
            throw new MojoFailureException("ampLocation " + ampLocation.getAbsolutePath() + " was neither an AMP file or a folder containing AMP files - AMP installation cannot proceed");
@@ -4,12 +4,14 @@ import java.io.File;

 import org.alfresco.repo.module.tool.ModuleManagementTool;
 import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.Plugin;
 import org.apache.maven.plugin.LegacySupport;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.zip.AbstractZipUnArchiver;
 import org.codehaus.plexus.component.annotations.Requirement;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
 /**
 * This class provides AMP unpacking support for projects depending on AMPs
 * This allows for example AMPs to be specified as <overlay> in the maven-war-plugin
@@ -18,40 +20,72 @@ import org.codehaus.plexus.component.annotations.Requirement;
 */
 public class AmpUnArchiver extends AbstractZipUnArchiver {

+	@Requirement
+	private LegacySupport legacySupport;
+	
    public AmpUnArchiver()
    {
+    	
    }
-    @Requirement
-    private LegacySupport legacySupport;
-
+    
+    protected File destDirectory;
+    
    @Override
    /**
     * By default the AMPs are unpacked in ${project.directory}/${project.build.finalName}
     */
    public File getDestDirectory() {
-        MavenSession session = legacySupport.getSession();
-        MavenProject project = session.getCurrentProject();
-        return new File(project.getBuild().getDirectory() + File.separator + project.getBuild().getFinalName());
+    	MavenSession session = legacySupport.getSession();
+    	MavenProject project = session.getCurrentProject().getExecutionProject();
+    	
+    	
+        File location = new File(project.getBuild().getDirectory() + File.separator + project.getBuild().getFinalName());
+        // If the war plugin configures a custom webappDirectory instead, we pick it up - this only works is this is defined in the main maven-war-plugin configuration
+        // TODO fix it for executions, see https://github.com/Alfresco/alfresco-sdk/issues/297
+        Plugin warPlugin = project.getPlugin("org.apache.maven.plugins:maven-war-plugin");
+        if(warPlugin != null)
+        {
+        	Xpp3Dom warPluginConfig = (Xpp3Dom) warPlugin.getConfiguration();
+        	if(warPluginConfig != null)
+        	{
+        		Xpp3Dom warConfigElement = warPluginConfig.getChild("webappDirectory");
+        		if(warConfigElement != null)
+        		{
+        			String webappDir = warConfigElement.getValue();
+        			if(webappDir != null && !webappDir.isEmpty())
+        			{
+        				location = new File(webappDir);
+        			}
+        		}
+        	}
+        
+        }
+        return location;
+
    }

-    @Override
+	//@Override
    protected void execute() throws ArchiverException {
        try {
            /**
             * Invoke the ModuleManagementTool to install AMP modules on the WAR file;
             * so far, no backup or force flags are enabled
             */
+        	File destDirectory = getDestDirectory();
            ModuleManagementTool mmt = new ModuleManagementTool();
            mmt.setVerbose(false);
-            getLogger().info("getDestFile ():" + getDestFile());
-            getLogger().info("getDestFile ():" + getDestFile());
-            getLogger().info("getDestDirectory ():" + getDestDirectory());
            
-            File destLocation = (getDestFile() == null || !getDestFile().exists() ) ? getDestDirectory() : getDestFile();
+            if(getDestFile() != null)
+            	getLogger().info("Installing into destination file: " + getDestFile());
+            
+            if(getDestDirectory()!= null)
+            	getLogger().info("Installing into destination folder: " + destDirectory);
+            
+            File destLocation = (getDestFile() == null || !getDestFile().exists() ) ? destDirectory : getDestFile();
            
            getLogger().info("Installing " + getSourceFile() + " into " + destLocation);
            try {
-                mmt.installModule(
+            	mmt.installModule(
                        getSourceFile().getAbsolutePath(),
                        destLocation.getAbsolutePath(),
                        false,  //preview
@@ -69,5 +103,5 @@ public class AmpUnArchiver extends AbstractZipUnArchiver {
      
        }
    }
-
+  
 }
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.alfresco.maven</groupId>
    <artifactId>alfresco-sdk-aggregator</artifactId>
-    <version>2.1.0-beta-1</version>
+    <version>2.1.1-beta-2</version>
    <name>Alfresco SDK</name>
    <description>This aggregator Project builds all modules required for the Alfresco SDK</description>
    <packaging>pom</packaging>
@@ -30,7 +30,7 @@
        <connection>scm:git:${scm.url.base}.git</connection>
        <developerConnection>scm:git:${scm.url.base}</developerConnection>
        <url>${scm.url.base}</url>
-      <tag>alfresco-sdk-aggregator-2.1.0-beta-1</tag>
+      <tag>alfresco-sdk-aggregator-2.1.1-beta-2</tag>
  </scm>

    <developers>
@@ -131,8 +131,11 @@

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
        <maven.archetype.version>2.2</maven.archetype.version>
        <alfresco.sdk.parent.version>${project.version}</alfresco.sdk.parent.version>
+        <alfresco.sdk.tests.exclude>*/*-enterprise/*</alfresco.sdk.tests.exclude>
        <alfresco.community.default.version>5.0.d</alfresco.community.default.version>
        <alfresco.enterprise.default.version>5.0.1</alfresco.enterprise.default.version>
        <alfresco.rm.version>2.3</alfresco.rm.version>
@@ -184,11 +187,37 @@
    </repositories>

    <profiles>
+        <profile>
+            <id>exclude-enterprise-tests-for-archetypes</id>
+            <activation>
+                <file>
+                    <exists>src/test/resources/projects</exists>
+                </file>
+            </activation>
+            <build>
+                <testResources>
+                    <testResource>
+                        <directory>src/test/resources</directory>
+                        <excludes>
+                            <exclude>${alfresco.sdk.tests.exclude}</exclude>
+                        </excludes>
+                    </testResource>
+                </testResources>
+            </build>
+        </profile>
+        <profile>
+            <id>enterprise-tests</id>
+            <properties>
+                <!-- Sets it to empty, so that also enterprise tests are run -->
+                <alfresco.sdk.tests.exclude />
+            </properties>
+        </profile>
+    	
        <profile>
            <id>sdk-release</id>
            <properties>
                <maven.site.url>https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-sdk-aggregator/latest</maven.site.url>
-                <maven.release.version>2.5.1</maven.release.version>
+                <maven.release.version>2.5.2</maven.release.version>
                <maven.release.goals>deploy site-deploy</maven.release.goals>
                <maven.site.version>3.4</maven.site.version>
                <maven.changes.version>2.10</maven.changes.version>
@@ -218,6 +247,11 @@
                                <goals>
                                    <goal>jar</goal>
                                </goals>
+                                <configuration>
+                                    <!-- Add this to build Javadoc with JDK8
+                                    <additionalparam>-Xdoclint:none</additionalparam>
+                                    -->
+                                </configuration>
                            </execution>
                        </executions>
                    </plugin>
@@ -243,7 +277,7 @@
                            <preparationGoals>clean install</preparationGoals>
                            <goals>${maven.release.goals}</goals>
                            <autoVersionSubmodules>true</autoVersionSubmodules>
-                            <releaseProfiles>sdk-release</releaseProfiles>
+                            <releaseProfiles>sdk-release,enterprise-tests</releaseProfiles>
                        </configuration>
                    </plugin>
                </plugins>
@@ -14,12 +14,12 @@
    <parent>
        <groupId>org.alfresco.maven</groupId>
        <artifactId>alfresco-sdk-aggregator</artifactId>
-        <version>2.1.0-beta-1</version>
+        <version>2.1.1-beta-2</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <!-- This defines the version of the SDK in terms of features -->
-    <version>2.1.0-beta-1</version>
+    <version>2.1.1-beta-2</version>


    <properties>
@@ -127,9 +127,11 @@

        <!-- Maven Plugins Versions used by the SDK -->
        <maven.compiler.version>3.2</maven.compiler.version>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
        <maven.clean.version>2.6.1</maven.clean.version>
        <maven.dependency.version>2.9</maven.dependency.version>
-        <maven.enforcer.plugin>1.3.1</maven.enforcer.plugin>
+        <maven.enforcer.plugin>1.4</maven.enforcer.plugin>
        <maven.resources.version>2.7</maven.resources.version>
        <maven.surefire.version>2.18</maven.surefire.version>
        <maven.install.version>2.5.2</maven.install.version>
@@ -148,7 +150,7 @@
              - Maven Alfresco plugin that enables Maven to handle AMP files (alfresco-maven-plugin)
              - Alfresco Rapid Application Development module (alfresco-rad)
        -->
-        <maven.alfresco.version>2.1.0-beta-1</maven.alfresco.version>
+        <maven.alfresco.version>2.1.1-beta-2</maven.alfresco.version>

        <!-- Setup the default Embedded Tomcat port for use by the tomcat7-maven-plugin so
             it can be accessed from the Groovy scripts and other places -->
@@ -233,10 +235,6 @@
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-compiler-plugin</artifactId>
                    <version>${maven.compiler.version}</version>
-                    <configuration>
-                        <source>1.7</source>
-                        <target>1.7</target>
-                    </configuration>
                </plugin>
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
@@ -270,6 +268,7 @@
                            <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
                            <nonFilteredFileExtension>css</nonFilteredFileExtension>
                            <nonFilteredFileExtension>ico</nonFilteredFileExtension>
+                            <nonFilteredFileExtension>psd</nonFilteredFileExtension>
                        </nonFilteredFileExtensions>
                    </configuration>
                </plugin>
@@ -291,11 +290,6 @@
                            <artifactId>alfresco-maven-plugin</artifactId>
                            <version>${maven.alfresco.version}</version>
                        </dependency>
-                        <dependency>
-                            <groupId>org.codehaus.plexus</groupId>
-                            <artifactId>plexus-archiver</artifactId>
-                            <version>2.3</version>
-                        </dependency>
                    </dependencies>
                </plugin>
                <plugin>
@@ -347,13 +341,6 @@
                            <artifactId>h2</artifactId>
                            <version>${h2.version}</version>
                        </dependency>
-                        <!-- Major performance improvement,
-                        see http://mindthegab.com/2013/06/20/maven-is-not-so-evil-plexus-archives-2-3-is-a-life-saver-for-the-speed-of-your-war-development-with-maven/ -->
-                        <dependency>
-                            <groupId>org.codehaus.plexus</groupId>
-                            <artifactId>plexus-archiver</artifactId>
-                            <version>2.3</version>
-                        </dependency>
                    </dependencies>
                </plugin>
                <!--m2e configuration only to prevent errors in import.
@@ -848,18 +835,12 @@
                                        <!-- Test for Alfresco version -->
                                        <requireProperty>
                                            <property>alfresco.version</property>
-                                            <message>The SDK 2.x is supported only for Alfresco 5.x Community and
-                                                Enterprise versions
+                                            <message>The SDK 2.1.x is supported only for Alfresco 5.0.d Community and above or
+                                                Alfresco Enterprise 5.0.1 and above
                                            </message>
-                                            <regex>^5\..*</regex>
+                                            <regex>^(5\.(0\.[d-z1-9]|[1-9])|6\.).*$</regex>
                                        </requireProperty>

-                                        <!-- Test for JDK version -->
-                                        <requireJavaVersion>
-                                            <version>[1.7.0,)</version>
-                                            <message>Alfresco 5+ requires Java 7</message>
-                                        </requireJavaVersion>
-
                                        <!-- Test for Maven version -->
                                        <requireMavenVersion>
                                            <version>3.2.2</version>
@@ -874,7 +855,10 @@
            </build>
        </profile>

-
+        <!--
+            Turn on webapp refresh for both Alfresco Repo (alfresco.war) and Alfresco Share (share.war)
+            if we find a module.properties file for an AMP extension.
+             -->
        <profile>
            <id>refresh-both</id>
            <activation>
@@ -902,8 +886,6 @@
        </profile>


-
-
        <!-- ====================================================================================================
              ONE OFF/SETUP operations
             ==================================================================================================== -->
Author	SHA1	Message	Date
alfresco-build	a11a3a65b6	[maven-release-plugin] prepare release alfresco-sdk-aggregator-2.1.1-beta-2	2015-09-28 13:12:03 +01:00
Ole Hejlskov	5936c3fcda	Merge pull request #326 from binovo/Issue/317 fix issue #317	2015-09-24 15:15:47 +02:00
alfresco-build	235a84105a	[maven-release-plugin] prepare for next development iteration	2015-09-01 09:04:47 +01:00
alfresco-build	3465b3aaf5	[maven-release-plugin] prepare release alfresco-sdk-aggregator-2.1.1-beta-1	2015-09-01 09:04:41 +01:00
Ole Hejlskov	509e4072e8	Revert version back to 2.1.1-SNAPSHOT	2015-09-01 09:29:52 +02:00
alfresco-build	6e7e2d7740	[maven-release-plugin] prepare release alfresco-sdk-aggregator-2.0.0	2015-08-31 15:08:14 +01:00
Martin Bergljung	841c72e64a	DEVPLAT-258,Ensure demoComponent is loaded properly,#220	2015-08-27 08:23:47 +01:00
Martin Bergljung	6b83be9d9f	DEVPLAT-83 - Remove plexus-archiver from maven-war-plugin definition in parent SDK pom	2015-08-26 12:11:52 +01:00
Martin Bergljung	f4c9a36256	DEVPLAT-107 - Add scope test to <artifactId>selenium-java</artifactId> in aio/share-amp/pom.xml, #300	2015-08-26 11:43:59 +01:00
Martin Bergljung	7309916d83	DEVPLAT-151 - Files that are generated from the Share AMP archetype needs unique names	2015-08-26 10:22:45 +01:00
mindthegab	de723e44ff	Fix DOCS-1155	2015-08-12 16:48:07 -04:00
Igor Blanco	60dac34448	fix issue #317	2015-08-03 15:50:41 +02:00
mindthegab	477067a992	udpated release profile to run enterprise-tests as per issue #314	2015-07-30 14:16:18 -04:00
mindthegab	016879ec87	added link to command reference in response to request on issue #309	2015-07-30 14:12:20 -04:00
mindthegab	97cbaefc6f	fixed issue #314 - by default now mvn clean install works without enterprise access. to run enterprise-tests use -Penterprise-tests	2015-07-30 13:46:54 -04:00
Samuel Langlois	c854a0aad3	Issue #301 : remove JDK8 specific flag for Javadoc	2015-07-23 10:24:52 +01:00
Samuel Langlois	d483c01a6c	Set ALL settings to Java 7 for compiler plugin + remove test on JDK version	2015-07-23 10:15:45 +01:00
mindthegab	3116123800	reverted target version for the SDK to java7 for issue #301 , added some logging for issue #297	2015-07-22 17:10:26 -04:00
mindthegab	a39a11ffe7	fixed issue #297 , now webappDirectory is honored if present	2015-06-01 18:13:36 +01:00
mindthegab	41dd5ff1ea	imprving unarchiver logging	2015-06-01 12:54:13 +01:00
mindthegab	2a3eb3919e	improved logging	2015-05-29 17:00:19 -04:00
mindthegab	f9c4647f22	more fixes for issue #254	2015-05-29 10:31:17 -04:00
mindthegab	bc97442af7	Merge pull request #288 from jphuynh/master DEVPLAT-75: Added Alfresco PGP public key and fingerprint information	2015-05-22 09:46:55 -04:00
Jean-Pierre Huynh	9c49d6c7f9	DEVPLAT-75: Added Alfresco PGP public key and fingerprint information	2015-05-21 07:29:06 +01:00
mindthegab	2453421d1b	Update README.md	2015-05-20 18:28:36 -04:00
mindthegab	5e17baa651	Update README.md	2015-05-20 18:19:32 -04:00
mindthegab	c3b43c0c68	Update README.md	2015-05-20 18:18:28 -04:00
mindthegab	6f0589ce63	Update README.md	2015-05-20 18:17:08 -04:00
mindthegab	abee710157	Updated readme.MD	2015-05-20 18:12:53 -04:00
mindthegab	19b0d1d8a7	Updated README for SDK 2.1.0 release	2015-05-20 18:07:52 -04:00
mindthegab	6ebaa083d4	Merge pull request #281 from Alfresco/readme-update Updated SDK README, needs further edits.	2015-05-20 17:23:33 -04:00
mindthegab	80f62c65ca	Merge branch 'master' of https://github.com/Alfresco/alfresco-sdk	2015-05-20 12:01:22 -04:00
mindthegab	f946d711ea	issue #267 - added logging to install amp goal	2015-05-20 12:01:07 -04:00
alfresco-build	4a25c4ceba	[maven-release-plugin] prepare for next development iteration	2015-05-20 13:24:05 +01:00
alfresco-build	6140990608	[maven-release-plugin] prepare release alfresco-sdk-aggregator-2.1.0	2015-05-20 13:24:00 +01:00
Martin Bergljung	6a6fcacf78	DEVPLAT-72: Move site-webscripts and site-data in under web-extension for share-amp	2015-05-18 14:11:06 +01:00
Martin Bergljung	3a9f08620a	DEVPLAT-71: Set <disable-resource-caching> to false for AIO and Share AMP	2015-05-18 11:33:26 +01:00
Martin Bergljung	8b48a63e0a	DEVPLAT-70, the share/src/test directory in the AIO artefact is not generated	2015-05-18 09:22:01 +01:00
Martin Bergljung	d0fdd2fdfe	Updated enforcer plugin config, DEVPLAT-67	2015-05-15 11:11:40 +01:00
mindthegab	603fe956c6	DEVPLAT-67 - partial update for JDK 8	2015-05-14 11:00:21 -04:00
mindthegab	ccb6728e4c	Merge branch 'master' of https://github.com/Alfresco/alfresco-sdk	2015-05-14 10:49:37 -04:00
mindthegab	3ef4131ce8	Fixing javadoc strict build	2015-05-14 10:38:18 -04:00
Martin Bergljung	f1735544ab	Fixed Solr Data Dir path on Windows, #284	2015-05-14 11:38:12 +01:00
Ole Hejlskov	ee6861e873	Bump to Java 8 by default	2015-05-12 17:24:48 +02:00
Ole Hejlskov	2a45c2eaa5	Merge pull request #277 from rpiccoli/master Alfresco 5.0.1 supports Java 8, but Maven Compiler settings are hardcode...	2015-05-12 17:07:49 +02:00
Martin Bergljung	b33837280d	Added Java controller to sample webscript	2015-05-12 10:47:34 +01:00
Ole Hejlskov	748231a932	Rename properties to a more consistent scheme. All refresh mojo related properties are now maven.alfresco.refresh.* (#283 )	2015-05-11 15:39:42 +02:00
Ole Hejlskov	8707fbebbf	Merge branch 'master' of https://github.com/Alfresco/alfresco-sdk	2015-05-11 15:23:56 +02:00
Ole Hejlskov	8d5d26a1a5	Add the alfresco-maven-plugin to AIO parent poms so the plugin shows up in IDEA (#283 )	2015-05-11 15:23:14 +02:00
alfresco-build	0f6b82d7f1	[maven-release-plugin] prepare for next development iteration	2015-05-11 14:12:53 +01:00
Martin Bergljung	f050c75615	Updated SDK README	2015-05-06 09:38:04 +01:00
Ricardo Piccoli	d4872f7e1a	Alfresco 5.0.1 supports Java 8, but Maven Compiler settings are hardcoded to 1.7	2015-05-01 14:10:16 +01:00
Ricardo Piccoli	126747dbc9	Alfresco 5.0.1 supports Java 8, but Maven Compiler settings are hardcoded to 1.7	2015-04-28 10:41:06 +01:00