updates to site
git-svn-id: https://svn.apache.org/repos/asf/incubator/wink/site/trunk@798496 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/site/how-to.txt b/site/how-to.txt
index ab203d4..58b4fe7 100644
--- a/site/how-to.txt
+++ b/site/how-to.txt
@@ -46,5 +46,5 @@
</settings>
3.3. Refer to http://maven.apache.org/plugins/maven-deploy-plugin/examples/deploy-ssh-external.html
if you have additional problems.
-4. Run "mvn clean site site-deploy"
-5. Don't forget to commit changes you did to site to the SVN repository. However, don't commit target folder!
+4. Commit all changes, the build will fail if there are local changes.
+5. Run "mvn clean site site-deploy"
diff --git a/site/pom.xml b/site/pom.xml
index e050eb4..0eb9897 100644
--- a/site/pom.xml
+++ b/site/pom.xml
@@ -28,11 +28,6 @@
<version>6</version>
</parent>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <javadoc.aggregate>true</javadoc.aggregate>
- <javadoc.exclude.patterns>*internal:org.apache.wink.example</javadoc.exclude.patterns>
- <site.deploy.dir>C:/wink/buildsReports</site.deploy.dir>
- <file.system.site.deploy.dir>C:/wink/reports</file.system.site.deploy.dir>
</properties>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/wink/trunk</connection>
@@ -42,28 +37,14 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.2</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
- <goal>shade</goal>
+ <goal>check-local-modification</goal>
</goals>
- <configuration>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
- <transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
- </transformers>
- <artifactSet>
- <includes>
- <include>org.apache.maven.doxia:doxia-sink-api</include>
- <include>org.apache.maven.doxia:doxia-logging-api</include>
- </includes>
- </artifactSet>
- </configuration>
+ <phase>post-site</phase>
</execution>
</executions>
</plugin>
@@ -156,6 +137,11 @@
</build>
<reporting>
<plugins>
+ <!--
+ plugin> <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId> <configuration>
+ <fixVersionIds>0.1</fixVersionIds> </configuration> </plugin
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
@@ -176,14 +162,10 @@
</reportSet>
</reportSets>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
</plugins>
</reporting>
<issueManagement>
- <system>Jira Issue Tracker</system>
+ <system>JIRA</system>
<url>http://issues.apache.org/jira/browse/WINK</url>
</issueManagement>
<mailingLists>
@@ -257,7 +239,7 @@
</developer>
<developer>
<id>elman</id>
- <name>Elman Michael</name>
+ <name>Michael Elman</name>
<organization>HP</organization>
<roles>
<role>committer</role>
@@ -333,7 +315,9 @@
<site>
<id>ssh-repository</id>
<url>scpexe://people.apache.org/home/elman/public_html/wink</url>
- <!-- url>scpexe://people.apache.org/www/incubator.apache.org/wink</url -->
+ <!--
+ url>scpexe://people.apache.org/www/incubator.apache.org/wink</url
+ -->
</site>
</distributionManagement>
<inceptionYear>2009</inceptionYear>
diff --git a/site/src/site/apt/community.apt b/site/src/site/apt/community.apt
index c68c010..b5506b7 100644
--- a/site/src/site/apt/community.apt
+++ b/site/src/site/apt/community.apt
@@ -43,7 +43,7 @@
* Communication
- The Apache Wink project uses {{{mail-lists.html}mailing lists}} primarily to communicate with its members.\
+ The Apache Wink project uses {{{./mail-lists.html}mailing lists}} primarily to communicate with its members.\
IRC is also used for a real-time discussions.
** IRC
@@ -54,7 +54,7 @@
** Bug Reports
- Found bug? Enter an issue in the {{{issue-tracking.html}Issue Tracker}}.
+ Found bug? Enter an issue in the {{{./issue-tracking.html}Issue Tracker}}.
Before submitting an issue, please:
@@ -74,6 +74,6 @@
* Source Code
- The project sources are accessible via the {{{source-repository.html}SVN}}.
+ The project sources are accessible via the {{{./source-repository.html}SVN}}.
diff --git a/site/src/site/apt/documentation.apt b/site/src/site/apt/documentation.apt
index 8647732..8112836 100644
--- a/site/src/site/apt/documentation.apt
+++ b/site/src/site/apt/documentation.apt
@@ -1,8 +1,8 @@
-----
- Wink 0.1 Documentation
+ Wink Documentation
-----
-----
- June 2008
+ July 2009
~~
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -31,3 +31,11 @@
* {{{http://hudson.zones.apache.org/hudson/view/Wink/job/Wink-Trunk-JDK1.5/javadoc}API}} (Javadoc)
+* JAX-RS
+
+ * {{{http://cwiki.apache.org/confluence/display/WINK/JAX-RS}JAX-RS Guide}}
+
+ * {{{https://jsr311.dev.java.net}JSR 311 Development}}
+
+ * {{{http://jcp.org/en/jsr/detail?id=311}JSR 311 Specification}}
+
\ No newline at end of file
diff --git a/site/src/site/apt/downloads.apt b/site/src/site/apt/downloads.apt
deleted file mode 100644
index 05c2548..0000000
--- a/site/src/site/apt/downloads.apt
+++ /dev/null
@@ -1,64 +0,0 @@
- -----
- Downloads
- -----
- -----
- May 2009
-
-~~
-~~ 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.
-~~
-
-Apache Wink Downloads
-
- Wink is distributed in several formats for your convenience.
-
-* Distribution Archive
-
- {{{https://repository.apache.org/content/repositories/snapshots/org/apache/wink/wink-dist/0.1-incubating-SNAPSHOT/wink-dist-0.1-incubating-SNAPSHOT.zip}wink-dist-0.1-incubating-SNAPSHOT.zip}} - contains the Wink server module, client module, extensions, all 3-rd party dependencies, server and client examples, documentation.
-
-* Maven
-
-** Dependencies
-
- You can add the following dependencies to your Maven pom.xml to include the Apache Wink Client module and the Server module.
-
-*** Client
-
----------------------------------------
-<dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-client</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
-</dependency>
----------------------------------------
-
-*** Server
-
----------------------------------------
-<dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-server</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
-</dependency>
----------------------------------------
-
-** Repository
-
- https://repository.apache.org/content/repositories/snapshots/org/apache/wink/
-
-
diff --git a/site/src/site/confluence/downloads.confluence b/site/src/site/confluence/downloads.confluence
new file mode 100644
index 0000000..82cd312
--- /dev/null
+++ b/site/src/site/confluence/downloads.confluence
@@ -0,0 +1,45 @@
+h1. Apache Wink Downloads
+
+ Wink is distributed in several formats for your convenience.
+
+h2. Release
+
+ There is no release yet.
+
+h2. Latest Snapshots
+
+h3. Distribution Archive
+
+[wink-dist-0.1-incubating-SNAPSHOT.zip|https://repository.apache.org/content/repositories/snapshots/org/apache/wink/wink-dist/0.1-incubating-SNAPSHOT/wink-dist-0.1-incubating-SNAPSHOT.zip] - contains the Wink server module, client module, extensions, all 3-rd party dependencies, server and client examples, documentation.
+
+h3. Maven
+
+h4. Dependencies
+
+ Add the following dependencies to your Maven pom.xml to include the Apache Wink Client module and the Server module.
+
+h5. Client
+
+{code}
+<dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-client</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+</dependency>
+{code}
+
+h5. Server
+
+{code}
+<dependency>
+ <groupId>org.apache.wink</groupId>
+ <artifactId>wink-server</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+</dependency>
+{code}
+
+h4. Repository
+
+ https://repository.apache.org/content/repositories/snapshots/org/apache/wink/
+
+
diff --git a/site/src/site/confluence/news.confluence b/site/src/site/confluence/news.confluence
new file mode 100644
index 0000000..85e5a94
--- /dev/null
+++ b/site/src/site/confluence/news.confluence
@@ -0,0 +1,4 @@
+h1. News
+
+* 2009-07-01 - Wink is JAX-RS 1.0 compliant
+* 2009-05-27 - Wink enters incubation.
\ No newline at end of file
diff --git a/site/src/site/confluence/roadmap.confluence b/site/src/site/confluence/roadmap.confluence
new file mode 100644
index 0000000..dfa21be
--- /dev/null
+++ b/site/src/site/confluence/roadmap.confluence
@@ -0,0 +1,5 @@
+h1. Roadmap
+
+* The 0.1-incubation release is planned to the end of July 2009. \\ [Issues|https://issues.apache.org/jira/browse/WINK/fixforversion/12314063] that are scheduled for this release.
+
+* The 0.2-incubation release is planned to the end of August 2009. \\ [Issues|https://issues.apache.org/jira/browse/WINK/fixforversion/12314064] that are scheduled for this release.
\ No newline at end of file
diff --git a/site/src/site/resources/css/site.css b/site/src/site/resources/css/site.css
index 644b8f5..e93bb6e 100644
--- a/site/src/site/resources/css/site.css
+++ b/site/src/site/resources/css/site.css
@@ -33,6 +33,41 @@
font-size:1.75em
}
+#contentBox h3 {
+ padding: 4px 4px 4px 6px;
+ color: #F9F9F9;
+ font-weight: bold;
+ font-size: 15px;
+ background-color: #888888;
+ background-image: none;
+}
+
+#contentBox h4 {
+ padding: 4px 4px 4px 6px;
+ color: #777;
+ background-color: #D8D8D8;
+ font-weight: bold;
+ font-size: 1.2em
+ background-image: none;
+ background-repeat: no-repeat;
+ background-position: left bottom;
+ margin-left: 10px;
+}
+
+#contentBox h5 {
+ margin-left: 10px;
+ font-size: 1.05em
+}
+
+#contentBox h6 {
+ margin-left: 10px;
+ font-size: 1em
+}
+
+.source {
+ margin-left: 15px;
+}
+
.xright a:link, .xright a:visited {
color: #000099;
}
@@ -51,4 +86,8 @@
margin-top:10px;
margin-bottom:10px;
margin-right:20px;
+}
+
+p {
+ margin-left:12px;
}
\ No newline at end of file
diff --git a/site/src/site/resources/images/wink2-adv.png b/site/src/site/resources/images/wink2-adv.png
new file mode 100644
index 0000000..21e91c7
--- /dev/null
+++ b/site/src/site/resources/images/wink2-adv.png
Binary files differ
diff --git a/site/src/site/resources/images/wink2-idea.png b/site/src/site/resources/images/wink2-mod.png
similarity index 100%
rename from site/src/site/resources/images/wink2-idea.png
rename to site/src/site/resources/images/wink2-mod.png
Binary files differ
diff --git a/site/src/site/site.xml b/site/src/site/site.xml
index bcc22e2..30a36b1 100644
--- a/site/src/site/site.xml
+++ b/site/src/site/site.xml
@@ -19,6 +19,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<version position="none" />
+ <publishDate position="right"/>
<bannerRight>
<name>Apache Incubator</name>
<src>http://incubator.apache.org/images/apache-incubator-logo.png</src>
@@ -45,10 +46,17 @@
href="http://cwiki.apache.org/confluence/display/WINK/Index" />
<item name="Jira" href="${project.issueManagement.url}" />
</links>
+ <breadcrumbs>
+ <item name="Apache" href="http://www.apache.org"/>
+ <item name="Incubator" href="http://incubator.apache.org" />
+ <item name="Wink" href="http://incubator.apache.org/wink" />
+ </breadcrumbs>
<menu name="Main">
<item name="Introduction" href="./index.html" />
+ <item name="News" href="./news.html" />
<item name="Downloads" href="./downloads.html" />
<item name="Documentation" href="./documentation.html" />
+ <item name="Roadmap" href="./roadmap.html" />
<item name="Community" href="./community.html" />
<item name="FAQ" href="./faqs.html" />
</menu>
