https://issues.apache.org/jira/browse/EXTSCRIPT-148
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1091765 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-bundles/pom.xml b/extscript-bundles/pom.xml
index 1137d73..73e2747 100644
--- a/extscript-bundles/pom.xml
+++ b/extscript-bundles/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
<artifactId>extscript-root</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<scm>
diff --git a/extscript-core-root/extscript-core/pom.xml b/extscript-core-root/extscript-core/pom.xml
index 63f5c43..31a7037 100644
--- a/extscript-core-root/extscript-core/pom.xml
+++ b/extscript-core-root/extscript-core/pom.xml
@@ -26,14 +26,7 @@
<url>http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core</url>
</scm>
- <repositories>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
- </repositories>
+
<dependencies>
diff --git a/extscript-examples/myfaces12-example/pom.xml b/extscript-examples/myfaces12-example/pom.xml
index 275029b..781f96f 100644
--- a/extscript-examples/myfaces12-example/pom.xml
+++ b/extscript-examples/myfaces12-example/pom.xml
@@ -1,5 +1,6 @@
<?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">
+<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">
<parent>
<artifactId>extscript-examples</artifactId>
<groupId>org.apache.myfaces.extensions.scripting</groupId>
@@ -63,10 +64,9 @@
</dependency>
<!-- jstl because of facelets -->
<dependency>
- <groupId>jstl</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
- <scope>runtime</scope>
</dependency>
<dependency>
@@ -84,6 +84,5 @@
</dependencies>
-
-
+
</project>
diff --git a/extscript-examples/myfaces20-example/pom.xml b/extscript-examples/myfaces20-example/pom.xml
index f854dfc..d5e70c2 100644
--- a/extscript-examples/myfaces20-example/pom.xml
+++ b/extscript-examples/myfaces20-example/pom.xml
@@ -26,8 +26,14 @@
<repositories>
<repository>
- <id>maven2-repository.dev.java.net</id>
- <url>http://download.java.net/maven/2</url>
+ <id>jboss</id>
+ <url>http://repository.jboss.com/maven2/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
</repositories>
diff --git a/extscript-examples/myfaces20-extscript-helloworld/pom.xml b/extscript-examples/myfaces20-extscript-helloworld/pom.xml
index 9b1e536..ddc541d 100644
--- a/extscript-examples/myfaces20-extscript-helloworld/pom.xml
+++ b/extscript-examples/myfaces20-extscript-helloworld/pom.xml
@@ -24,13 +24,6 @@
<url>http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld</url>
</scm>
- <repositories>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <url>http://download.java.net/maven/2</url>
- </repository>
-
- </repositories>
<build>
<plugins>
diff --git a/pom.xml b/pom.xml
index 4535444..78f55df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>9</version>
+ <version>10</version>
</parent>
<modules>
@@ -56,39 +56,7 @@
<url>http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk</url>
</scm>
- <repositories>
- <repository>
- <id>jboss</id>
- <url>http://repository.jboss.com/maven2/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>maven2-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <layout>default</layout>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>apache-maven-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
- </repositories>
<dependencies>
<!-- compile -->
@@ -191,7 +159,7 @@
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
+ <version>2.6</version>
<executions>
<execution>
<id>verify-style</id>
diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt
index 6855446..37d040d 100644
--- a/src/site/apt/download.apt
+++ b/src/site/apt/download.apt
@@ -19,29 +19,38 @@
Download Apache MyFaces Extension Scripting
- As of now the project is in beta stage, so no fully stable release has happened.
- While we personally think the project already has beta quality, no official beta has been done yet.
+ As of now the project has an initial 1.0 release.
+ The initial release will only run with Apache MyFaces up to 2.0.2.
+ A subsequent release will follow soon which will support later versions
+ of Apache MyFaces.
- The best bet to try Ext-Scripting for now is a source build from maven (see link below)
- For Binary Builds from maven you can use the Alpha Repository or the trunk
- (see {{{installation.html} the Ext-Scripting Installation Page }} for further information)
-
- The Binary Beta 1 "Release" Maven packages can be found in {{{http://people.apache.org/~lu4242/extscript10beta1} http://people.apache.org/~lu4242/extscript10beta1}}
-
- For manual inclusion of Ext-Scripting the meta bundles can be found here:
-
- * {{{http://people.apache.org/~lu4242/extscript10beta1/org/apache/myfaces/extension-scripting/extscript-myfaces12-bundle/1.0-beta-1/}MyFaces 1.2 meta bundle directory}}
- * {{{http://people.apache.org/~lu4242/extscript10beta1/org/apache/myfaces/extension-scripting/extscript-myfaces20-bundle/1.0-beta-1/}MyFaces 2.0 meta bundle directory}}
+ Apache MyFaces is distributed as jar archives for inclusion and as war archives for the
+ examples.
- The Binary Alpha 1 "Release" Maven packages can be found in {{{http://people.apache.org/~lu4242/extscript100alpha} http://people.apache.org/~lu4242/extscript100alpha}}
+ Use the links below to download
+
+
+ Release notes can be found {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=10600&version=12316153}here}}
+
+*-------------------------+---------+----------+-----------+
+| | Server | Checksum | Signature |
+*-------------------------+---------+----------+-----------+
+| Ext-Script MyFaces 1.2 bundle(jar) | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/extscript-myfaces12-bundle/1.0/extscript-myfaces12-bundle-1.0.jar} extscript-myfaces12-bundle-1.0.jar}} | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/extscript-myfaces12-bundle/1.0/extscript-myfaces12-bundle-1.0.jar.asc.md5} extscript-myfaces12-bundle-1.0.jar.asc.md5}} | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/extscript-myfaces12-bundle/1.0/extscript-myfaces12-bundle-1.0.jar.asc}extscript-myfaces12-bundle-1.0.jar.asc}} |
+*-------------------------+---------+----------+-----------+
+| Ext-Script MyFaces 2.0 bundle(jar) | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/extscript-myfaces20-bundle/1.0/extscript-myfaces20-bundle-1.0.jar} extscript-myfaces20-bundle-1.0.jar}} | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/extscript-myfaces20-bundle/1.0/extscript-myfaces20-bundle-1.0.jar.asc.md5} extscript-myfaces20-bundle-1.0.jar.asc.md5}} | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/extscript-myfaces20-bundle/1.0/extscript-myfaces20-bundle-1.0.jar.asc}extscript-myfaces20-bundle-1.0.jar.asc}} |
+*-------------------------+---------+----------+-----------+
+| Ext-Script Demo Application MyFaces 1.2 (war) | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/myfaces12-example/1.0/myfaces12-example-1.0.war} myfaces12-example-1.0.war}} | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/myfaces12-example/1.0/myfaces12-example-1.0.war.asc.md5} myfaces12-example-1.0.war.asc.md5}} | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/myfaces12-example/1.0/myfaces12-example-1.0.war.asc}myfaces12-example-1.0.war.asc}} |
+*-------------------------+---------+----------+-----------+
+| Ext-Script Demo Application MyFaces 2.0 (war) | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/myfaces20-example/1.0/myfaces20-example-1.0.war} myfaces20-example-1.0.war}} | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/myfaces20-example/1.0/myfaces20-example-1.0.war.asc.md5} myfaces20-example-1.0.war.asc.md5}} | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/myfaces20-example/1.0/myfaces20-example-1.0.war.asc}myfaces20-example-1.0.war.asc}} |
+*-------------------------+---------+----------+-----------+
+| Ext-Script Blank Application JSF2 (war) | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/myfaces20-extscript-helloworld/1.0/myfaces20-extscript-helloworld-1.0.war} myfaces20-extscript-helloworld-1.0.war}} | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/myfaces20-extscript-helloworld/1.0/myfaces20-extscript-helloworld-1.0.war.md5} myfaces20-extscript-helloworld-1.0.war.md5}} | {{{https://repository.apache.org/content/repositories/releases/org/apache/myfaces/extensions/scripting/myfaces20-extscript-helloworld/1.0/myfaces20-extscript-helloworld-1.0.war.asc} myfaces20-extscript-helloworld-1.0.war.asc}} |
+*-------------------------+---------+----------+-----------+
Manual Checkout and Build
For manual checkout and building instructions of the Ext-Scripting Trunk {{{installation.html}Ext-Scripting installation page}}
- For manual download instructions of the Ext-Scripting Beta 1 release follow the link to the {{{install_beta_1.html}Ext-Scripting Beta 1 installation page}}
- For manual download instructions of the Ext-Scripting Alpha 1 release follow the link to the {{{install_alpha_1.html}Ext-Scripting Alpha 1 installation page}}
Latest source code from SVN repository
diff --git a/src/site/site.xml b/src/site/site.xml
index e9e2b8c..7412e89 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -36,7 +36,7 @@
<skin>
<groupId>org.apache.myfaces.maven</groupId>
<artifactId>myfaces-site-skin</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>2</version>
</skin>
<body>
<links>
diff --git a/src/site/xdoc/installation.xml b/src/site/xdoc/installation.xml
index ae93c59..604d95e 100644
--- a/src/site/xdoc/installation.xml
+++ b/src/site/xdoc/installation.xml
@@ -32,16 +32,14 @@
</section>
<section name="General information">
- This section applies to setting up Ext-Scripting from the latest codebase if you want
- to set it up from one of the beta or alpha builds please follow following instructions:
- <ul>
- <li>
- <a href="install_beta_1.html">Installation Instructions for Beta-1</a>
- </li>
- <li>
- <a href="install_alpha_1.html">Installation Instructions for Alpha-1</a>
- </li>
- </ul>
+ This page covers the general installation and integration process, it does not
+ go into the details of the configuration.
+
+
+ The section covers the setup via download or custom build. If you need configuration detail info
+ or info on how to setup your ide correctly please follow the links in the navigation to
+ the correct section.
+
</section>
@@ -73,6 +71,21 @@
</section>
+ <section name="Download">
+ <p>
+ With version 1.0 Ext-Scripting provides all necessary artifacts
+ as download artifacts to get quickly started.
+ A kickstart project is provided which can be used as shell for your own
+ projects.
+ </p>
+ <p>
+ For Download information please visit the <a href="download.html"> download page</a>.
+ </p>
+ <p>
+ Once you downloaded the necessary artifacts please check the <a href="#Manual_Setup">manual setup section</a> of this document.
+ </p>
+ </section>
+
<section name="Checkout and Build">
<p>
While Ext-Scripting is already in beta stage, the best way to get started
diff --git a/src/site/xdoc/setup_steps.xml b/src/site/xdoc/setup_steps.xml
index e99d987..d7fcfa2 100644
--- a/src/site/xdoc/setup_steps.xml
+++ b/src/site/xdoc/setup_steps.xml
@@ -65,6 +65,7 @@
<ul>
<li>Check if your installation environment is setup</li>
<li>Download the appropriate meta bundle and add it to your dependency and deployment settings
+ (for the download location check the <a href="./download.html">download page</a>)
</li>
<li>Download groovy-all.jar and add it to your dependency and deployment settings</li>
<li>Prepare your script paths</li>
diff --git a/src/site/xdoc/usersguide.xml b/src/site/xdoc/usersguide.xml
index 0bddee5..c2ce7c6 100644
--- a/src/site/xdoc/usersguide.xml
+++ b/src/site/xdoc/usersguide.xml
@@ -45,6 +45,8 @@
First of all Ext-Scripting in its current incarnation tries to help the programmers every day life. That
means, it tries to reduce the number of needed server restarts to the lowest possible minimum which is
achievable within the boundaries of Java and JSF.
+ Also it is not yet fully integrated into the bigger application servers, testing only currently is
+ done for Apache Tomcat and Jetty.
</p>
<p>
You won't get a zero restart configuration, Extension-Scripting tries not to be perfect in this regard,
