You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/02/25 09:57:38 UTC
[GitHub] vieiro closed pull request #7: Apache and Oracle trademark notices, link to incubator status, arranged some broken links, removed wiki JCA pages, added another backround, added ASF resources for events.
vieiro closed pull request #7: Apache and Oracle trademark notices, link to incubator status, arranged some broken links, removed wiki JCA pages, added another backround, added ASF resources for events.
URL: https://github.com/apache/incubator-netbeans-website/pull/7
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/README.asciidoc b/README.asciidoc
index fad467d..4e7508b 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -1,6 +1,5 @@
= Apache NetBeans (incubating) web sites
-NOTE: This is still *a work in progress*, pending a community approval.
This repository is structured in different *subdirectories*, for different subdomains.
@@ -12,6 +11,32 @@ link:bits.netbeans.org[bits.netbeans.org]:: Apache NetBeans API documentation
- Will be integrated with http://github.com/apache/incubator-netbeans
- Will generate javadocs for each release.
+NOTE: This is still *a work in progress*, pending a community approval.
+
+== Apache guidelines for web sites
+
+Apache provides different guidelines for project websites. Here are some:
+
+Project-related non-apache.org domain names::
+https://www.apache.org/foundation/marks/pmcs#nonapache
+
+Apache Website Navigation Links Policy::
+https://www.apache.org/foundation/marks/pmcs#navigation
+
+Incubator Branding Guide::
+http://incubator.apache.org/guides/branding.html
+
+Using `svnpubsub` or `CMS` for web site publishing, and using branches::
+https://www.apache.org/dev/project-site.html#generated
+
+Using `.htaccess` to configure the web server::
+https://www.apache.org/dev/project-site.html#configure
+
+How to manage my project's webpage::
+https://www.apache.org/dev/project-site.html#intro
+
+
+
== Related issues
- INFRA: https://issues.apache.org/jira/browse/INFRA-13174
diff --git a/netbeans.apache.org/README.asciidoc b/netbeans.apache.org/README.asciidoc
index a1835ed..7379b18 100644
--- a/netbeans.apache.org/README.asciidoc
+++ b/netbeans.apache.org/README.asciidoc
@@ -1,10 +1,26 @@
+////
+ 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 NetBeans / netbeans.apache.org
:toc:
The http://netbeans.apache.org website.
-NOTE: This is still *a work in progress*, pending a community approval.
-
== Introduction. Objectives.
The NetBeans project has a huge website at https://www.netbeans.org. The site
@@ -24,7 +40,7 @@ This is ongoing effort and is being performed in these two steps:
== About this repository
-As stated above, the objective of this repository is to construct a temporary website at http://netbeans.apache.org
+As stated above, the objective of this repository is to construct the website at http://netbeans.apache.org
that will gradually receive content from http://netbeans.org (as stored in https://github.com/apache/incubator-netbeans-website-cleanup).
The tasks to do are described in a specific [NetBeans Wiki Page](https://cwiki.apache.org/confluence/display/NETBEANS/New+NetBeans+Web+Site+Planning).
diff --git a/netbeans.apache.org/src/content/community/events.asciidoc b/netbeans.apache.org/src/content/community/events.asciidoc
index f5e6f1d..4118b21 100644
--- a/netbeans.apache.org/src/content/community/events.asciidoc
+++ b/netbeans.apache.org/src/content/community/events.asciidoc
@@ -40,5 +40,20 @@ guidelines] before announcing or promoting these events.
We are still working out those requirements, this page will then list
events of interest for the NetBeans Community.
+=== Apache Software Foundation resources
+
+The Apache Software Foundation provides different resources for events and conferences:
+
+- link:https://www.apache.org/foundation/marks/events[Apache Event Branding Policy Overview].
+- link:http://community.apache.org/speakers/slides.html[Apache related slides], see also more link:http://community.apache.org/speakers/index.html[Speaker Support Materials]
+and link:https://community.apache.org/speakers/[Speaker information], including an Apache press kit.
+- The link:https://www.youtube.com/user/TheApacheFoundation/[ASF YouTube Channel] can be used to upload videos.
+- You can list yourself as a link:http://community.apache.org/speakers/speakers.html[potential speaker].
+- link:http://community.apache.org/calendars/conferences.html[Events calendar].
+- link:https://www.apache.org/events/meetups.html[Upcoming Apache-Related meetups].
+
+Be sure to also check the Apache Software Foundation link:http://community.apache.org/[Apache Community Development] page.
+
+
diff --git a/netbeans.apache.org/src/content/download/index.asciidoc b/netbeans.apache.org/src/content/download/index.asciidoc
index 66618fc..bfca649 100644
--- a/netbeans.apache.org/src/content/download/index.asciidoc
+++ b/netbeans.apache.org/src/content/download/index.asciidoc
@@ -35,7 +35,10 @@ for important requirements for download pages for Apache projects.
[[releases]]
== Releases
-- link:nb90-beta.html[Apache NetBeans 9.0 Beta], released on the 22nd of February, 2018.
+=== Apache NetBeans 9.0
+
+- link:nb90/[Apache NetBeans 9.0 Features]
+- link:nb90/nb90-beta.html[Apache NetBeans 9.0 Beta], released on the 22nd of February, 2018.
[[latest]]
== Latest Builds
@@ -59,6 +62,16 @@ Once you're all set just enter the `incubator-netbeans` directory and type:
Now that you have built Apache NetBeans from source you may want to link:/participate/submit-pr.html[submit a pull request].
+[[repos]]
+=== Repositories
+
+This is a list of Apache NetBeans (incubating) repositories:
+
+- https://github.com/apache/incubator-netbeans The main source code repository.
+- https://github.com/apache/incubator-netbeans-website This website's repository.
+- https://github.com/apache/incubator-netbeans-website-cleanup A repository used to clean up existing documentation from http://netbeans.org
+- Emilian Bold has converted the previous Mercurial repository (http://hg.netbeans.org) to git, for historical reference, and has kindly uploaded it to github at https://github.com/emilianbold/netbeans-releases. Thanks, Emilian!
+
[[previous]]
== Previous NetBeans versions
diff --git a/netbeans.apache.org/src/content/download/nb90/index.asciidoc b/netbeans.apache.org/src/content/download/nb90/index.asciidoc
new file mode 100644
index 0000000..3130b69
--- /dev/null
+++ b/netbeans.apache.org/src/content/download/nb90/index.asciidoc
@@ -0,0 +1,137 @@
+////
+ 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 NetBeans IDE 9.0 features
+:jbake-type: page
+:jbake-tags: 9.0 features
+:jbake-status: published
+:keywords: Apache NetBeans 9.0 IDE features
+:icons: font
+:description: Apache NetBeans 9.0 (incubating) features
+:toc: left
+:toc-title:
+:toclevels: 4
+
+== Apache NetBeans IDE (incubating) 9.0
+
+Apache NetBeans 9.0 is the first release of the Apache NetBeans IDE.
+
+The main goals for this release are
+
+- IP clearance of the Oracle code donation.
+- Java 9 Support.
+
+=== Downloads
+
+- See link:/download/nb90/nb90-beta.html[Apache NetBeans 9.0 Beta], released on february, 2018.
+
+=== Features
+
+NOTE: This is a list of the *proposed* features of Apache NetBeans 9.0. The beta release may provide a *subset* of these.
+
+////
+To display a feature do as follows:
+
+Add a header title, and an anonymous asciidoc block (--) with the ".feature" metadata, and write text inside the block:
+
+== A title here
+[.feature]
+--
+This is a feature
+--
+
+You can add images to the feature by adding a png file along with the document, and adding a image: construct to the text.
+
+Use role="left" for left alignment or role="right" for right alignment.
+
+Examples:
+
+== An amazing feature
+[.feature]
+--
+Here goes some text
+
+image:nb90-module-info.png[Adding module-info.java, title="Adding module-info.java, click to enlarge", role="left", link="nb90-module-info.png"]
+
+And some more text
+
+image:nb90-module-info-completion.png[Autocompletion in module-info.java, title="Autocompletion in module-info.java, click to enlarge", role="right", link="nb90-module-info-completion.png"]
+
+And even some more
+--
+
+////
+==== Supporting JPMS (Jigsaw) to full extent
+[.feature]
+--
+image:nb90-module-info.png[Adding module-info.java, title="Adding module-info.java, click to enlarge", role="left", link="nb90-module-info.png"]
+
+NetBeans 9 supports link:http://openjdk.java.net/projects/jigsaw/spec/[JPMS (Jigsaw)] to full extent.
+
+Modulepath was added as a crucial paradigm to NetBeans in addition to Classpath.
+
+The standard NetBeans Java SE Project Type (Ant based) can be a single JDK9 module simply by adding a `module-info.java` file into the default package.
+
+image:nb90-module-info-completion.png[Autocompletion in module-info.java, title="Autocompletion in module-info.java, click to enlarge", role="right", link="nb90-module-info-completion.png"]
+
+Of course, we provide full autocompletion for `module-info.java`
+--
+
+==== A brand new Java Modular Application project type
+[.feature]
+--
+image:nb90-new-multi-module.png[Java Modular Application, title="New Java Modular Application Project Type, click to enlarge", role="left", link="nb90-new-multi-module.png"]
+
+We have added a new *Java Modular project* type. This allows to develop
+several JDK9 modules in one NetBeans project (Ant based).
+
+The advantage of this project type over several Java SE projects (each
+containing one module) is that dependencies are simply managed by declaring
+appropriate `exports` and `requires` in `module-info.java`, and all modules
+in the project will be compiled at once.
+--
+
+==== Java Shell support
+[.feature]
+--
+Java Shell is a new tool included in JDK9 defined in link:http://openjdk.java.net/jeps/222[JEP 222] to introduce REPL
+(read-eval-print-loop) capabilities to Java.
+
+image:nb90-javashell.png[Java Shell Support, title="Java Shell Support, click to enlarge", role="left", link="nb90-javashell.png"]
+
+NetBeans provides integrated console-like UI for the Java Shell, leveraing NetBeans editor capabilites.
+
+NetBeans can support the tool with the user project configuration, so the Java
+Shell is set up to work with project classes and libraries, providing autocompletion out of the box in
+the editor.
+
+image:nb90-shell-agent.png[Shell Agent Configuration, title="JShell acess configuration, click to enlarge", role="right", link="nb90-shell-agent.png"]
+
+Also NetBeans greatly extends the capabilities of the commandline tool.
+NetBeans can execute the shell *as an agent*, similar to a debugging agent, on the
+debugged or run application (currently only J2SE applications are supported,
+both Ant and Maven-based).
+
+image:nb90-shell-save.png[Saving JShell snippets, title="Saving JShell snippets, click to enlarge", role="left", link="nb90-shell-save.png"]
+
+Snippets written in JShell can be redefined and tested, even against a running
+code. When the prototype is ready, it can be saved to a regular java source file
+and integrated with the project.
+
+--
+
diff --git a/netbeans.apache.org/src/content/download/nb90-beta.asciidoc b/netbeans.apache.org/src/content/download/nb90/nb90-beta.asciidoc
similarity index 84%
rename from netbeans.apache.org/src/content/download/nb90-beta.asciidoc
rename to netbeans.apache.org/src/content/download/nb90/nb90-beta.asciidoc
index a6656ba..9f1a027 100644
--- a/netbeans.apache.org/src/content/download/nb90-beta.asciidoc
+++ b/netbeans.apache.org/src/content/download/nb90/nb90-beta.asciidoc
@@ -38,11 +38,7 @@ Apache NetBeans (incubating) 9.0 Beta was announced on the 22nd of february, 201
=== Main features
-This release is *primarily focused on IP clearance*. Its functionality has not been tested ? the link:/participate/netcat.html[NetCAT (NetBeans Community Acceptance Testing)] process will begin during the coming months. Watch link:/participate/netcat.html[the NetCAT page] for upcoming announcements about NetCAT. When NetCAT completes, we will vote on the final release of Apache NetBeans (incubating) 9.0.
-
-This release constitutes all the modules in the link:https://github.com/apache/incubator-netbeans[Apache NetBeans Git] repo, which together provide the NetBeans Platform (i.e., the underlying application framework), which was released as Apache NetBeans (incubating) 9.0 Alpha, as well as all the modules that provide the Java SE-related features of Apache NetBeans, with special support for Java 9 features such as *JShell*, *JLink*, *Jigsaw* and more.
-
-In short, Apache NetBeans (incubating) 9.0 Beta is a *full IDE for Java SE 9* development.
+See link:/download/nb90/index.html[Apache NetBeans 9.0 Features] for a full list of features.
=== Downloading
diff --git a/netbeans.apache.org/src/content/download/nb90/nb90-javashell.png b/netbeans.apache.org/src/content/download/nb90/nb90-javashell.png
new file mode 100644
index 0000000..dbee11b
Binary files /dev/null and b/netbeans.apache.org/src/content/download/nb90/nb90-javashell.png differ
diff --git a/netbeans.apache.org/src/content/download/nb90/nb90-module-info-completion.png b/netbeans.apache.org/src/content/download/nb90/nb90-module-info-completion.png
new file mode 100644
index 0000000..37d4975
Binary files /dev/null and b/netbeans.apache.org/src/content/download/nb90/nb90-module-info-completion.png differ
diff --git a/netbeans.apache.org/src/content/download/nb90/nb90-module-info.png b/netbeans.apache.org/src/content/download/nb90/nb90-module-info.png
new file mode 100644
index 0000000..2af6e28
Binary files /dev/null and b/netbeans.apache.org/src/content/download/nb90/nb90-module-info.png differ
diff --git a/netbeans.apache.org/src/content/download/nb90/nb90-new-multi-module.png b/netbeans.apache.org/src/content/download/nb90/nb90-new-multi-module.png
new file mode 100644
index 0000000..16e239b
Binary files /dev/null and b/netbeans.apache.org/src/content/download/nb90/nb90-new-multi-module.png differ
diff --git a/netbeans.apache.org/src/content/download/nb90/nb90-shell-agent.png b/netbeans.apache.org/src/content/download/nb90/nb90-shell-agent.png
new file mode 100644
index 0000000..732e0a7
Binary files /dev/null and b/netbeans.apache.org/src/content/download/nb90/nb90-shell-agent.png differ
diff --git a/netbeans.apache.org/src/content/download/nb90/nb90-shell-save.png b/netbeans.apache.org/src/content/download/nb90/nb90-shell-save.png
new file mode 100644
index 0000000..4a86288
Binary files /dev/null and b/netbeans.apache.org/src/content/download/nb90/nb90-shell-save.png differ
diff --git a/netbeans.apache.org/src/content/images/hero-background-2.jpg b/netbeans.apache.org/src/content/images/hero-background-2.jpg
new file mode 100644
index 0000000..3e41c7c
Binary files /dev/null and b/netbeans.apache.org/src/content/images/hero-background-2.jpg differ
diff --git a/netbeans.apache.org/src/content/participate/index.asciidoc b/netbeans.apache.org/src/content/participate/index.asciidoc
index dd11087..140f818 100644
--- a/netbeans.apache.org/src/content/participate/index.asciidoc
+++ b/netbeans.apache.org/src/content/participate/index.asciidoc
@@ -47,4 +47,8 @@ builds for years.
== Improving the documentation
We will be porting existing NetBeans documentation soon. Keep posted for information on how to help with this task.
+[[asf]]
+== ASF Sponsorthip Program
+You may also want to consider doing a donation to the link:https://www.apache.org/foundation/sponsorship.html[Apache Sponsorship Program],
+or link:https://www.apache.org/foundation/buy_stuff.html[buying some ASF swag].
diff --git a/netbeans.apache.org/src/content/scss/common/_netbeans.scss b/netbeans.apache.org/src/content/scss/common/_netbeans.scss
index c440a9d..bee365d 100644
--- a/netbeans.apache.org/src/content/scss/common/_netbeans.scss
+++ b/netbeans.apache.org/src/content/scss/common/_netbeans.scss
@@ -113,6 +113,7 @@ dl dt {
}
.nb-orbit {
+ background: #000;
.orbit-container {
.orbit-slide {
color: #fff;
@@ -153,12 +154,25 @@ section.hero {
}
}
-.hero.news, .orbit-wrapper {
+.hero.news {
background: url('/images/hero-background.jpg') no-repeat;
background-size: cover;
background-position: center bottom;
}
+.netbeans-bg {
+ background: url('/images/hero-background.jpg') no-repeat;
+ background-size: cover;
+ background-position: center bottom;
+}
+
+.netbeans-bg-1 {
+ background: url('/images/hero-background-2.jpg') no-repeat;
+ background-size: cover;
+ background-position: center bottom;
+}
+
+
/*
diff --git a/netbeans.apache.org/src/content/scss/components/_features.scss b/netbeans.apache.org/src/content/scss/components/_features.scss
new file mode 100644
index 0000000..5f129e4
--- /dev/null
+++ b/netbeans.apache.org/src/content/scss/components/_features.scss
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+.openblock.feature {
+ padding: 1em;
+ margin: 0.5em;
+ overflow: auto;
+ padding: 1em 0 0.5em 0;
+
+ .title {
+ font-weight: bold;
+ font-size: 140%;
+ }
+
+ .content {
+ .paragraph {
+ p {
+ span.image {
+ max-width: 100%;
+ padding: 4px;
+ }
+ }
+ }
+ }
+
+ @include breakpoint(medium) {
+ .content {
+ .paragraph {
+ p {
+ span.image, span.image.left {
+ float: left;
+ margin: 0 1em 0 0;
+ max-width: 33%;
+ border: 1px solid $nb-link-color;
+ }
+ span.image.right {
+ float: right;
+ margin: 0 0 0 1em;
+ max-width: 33%;
+ border: 1px solid $nb-link-color;
+ }
+ }
+ }
+ }
+ &:after {
+ clear: both;
+ }
+ }
+
+
+}
+
diff --git a/netbeans.apache.org/src/content/scss/netbeans.scss b/netbeans.apache.org/src/content/scss/netbeans.scss
index de32252..9c7786c 100644
--- a/netbeans.apache.org/src/content/scss/netbeans.scss
+++ b/netbeans.apache.org/src/content/scss/netbeans.scss
@@ -35,3 +35,4 @@
@import "components/footer";
@import "components/card";
+@import "components/features";
diff --git a/netbeans.apache.org/src/content/templates/footer.gsp b/netbeans.apache.org/src/content/templates/footer.gsp
index af91d32..60f5fbf 100644
--- a/netbeans.apache.org/src/content/templates/footer.gsp
+++ b/netbeans.apache.org/src/content/templates/footer.gsp
@@ -21,13 +21,8 @@
<%/*
The Apache NetBeans site must comply with the
- "Apache Website Navigation Links Policy"
- available at
- https://www.apache.org/foundation/marks/pmcs#navigation
- and with the
- "Incubator Branding Guide"
- available at
- http://incubator.apache.org/guides/branding.html
+ "Apache Website Navigation Links Policy" https://www.apache.org/foundation/marks/pmcs#navigation
+ "Incubator Branding Guide" http://incubator.apache.org/guides/branding.html
This seems to be a good place to comply with the policy.
@@ -48,6 +43,7 @@
<li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
<li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
<li><a href="http://www.apache.org/security/">Security</a></li>
+ <li><a href="http://incubator.apache.org/projects/netbeans.html">Incubation Status</a></li>
</ul>
</div>
<div class="large-auto cell">
@@ -64,7 +60,7 @@
<ul>
<li><a href="/participate/submit-pr.html">Submitting Pull Requests</a></li>
<li><a href="/participate/report-issue.html">Reporting Issues</a></li>
- <li><a href="/participate/social.html">NetCAT - Community Acceptance Testing</a></li>
+ <li><a href="/participate/netcat.html">NetCAT - Community Acceptance Testing</a></li>
<li><a href="/participate/index.html#documentation">Improving the documentation</a></li>
</ul>
</div>
@@ -81,6 +77,9 @@
<h1><a href="/download/index.html">Download</a></h1>
<ul>
<li><a href="/download/index.html#releases">Releases</a></li>
+ <ul>
+ <li><a href="/download/nb90/index.html">Apache NetBeans 9.0 (beta)</a></li>
+ </ul>
<li><a href="/plugins/index.html">Plugins</a></li>
<li><a href="/download/index.html#source">Building from source</a></li>
<li><a href="/download/index.html#previous">Previous releases</a></li>
@@ -99,9 +98,11 @@
<p>Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner
consistent with other successful ASF projects.</p>
<p>While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the Apache Software Foundation.</p>
+ <p>Apache Incubator, Apache, the Apache feather logo, and the Apache Incubator project logo are trademarks of <a href="//www.apache.org">The Apache Software Foundation</a>.</p>
+ <p>Oracle and Java are registered trademarks of Oracle and/or its affiliates.</p>
</div>
<%
- /* This is used for debugging the website rendering */
+ /* This is used for debugging the website rendering, it displays the 'content' variable. Just set the "debug" metadata to a not null value (in asciidoc documents add ":debug: yes") to render this area. */
if (content.debug != null) {
out.println("<pre style='background: #777; color: #eee;'>");
for (String key: content.keySet()) {
diff --git a/netbeans.apache.org/src/content/templates/news.gsp b/netbeans.apache.org/src/content/templates/news.gsp
index 21daec8..5389aec 100644
--- a/netbeans.apache.org/src/content/templates/news.gsp
+++ b/netbeans.apache.org/src/content/templates/news.gsp
@@ -24,7 +24,7 @@
<div class='cell'>
<div class="annotation">Just released!</div>
<h1>Apache NetBeans 9.0 Beta</h1>
- <p><a class="button success" href="/download/nb90-beta.html">Read more</a></p>
+ <p><a class="button success" href="/download/nb90/nb90-beta.html">Read more</a></p>
</div>
</div>
</section>
diff --git a/netbeans.apache.org/src/content/templates/slider.gsp b/netbeans.apache.org/src/content/templates/slider.gsp
index 55cb722..a15e135 100644
--- a/netbeans.apache.org/src/content/templates/slider.gsp
+++ b/netbeans.apache.org/src/content/templates/slider.gsp
@@ -27,23 +27,35 @@
</div>
<ul class="orbit-container">
<li class="orbit-slide">
- <section class='hero alternate'>
+ <section class='hero alternate netbeans-bg'>
+ <div class='grid-container'>
+ <div class='cell'>
+ <div class='annotation'>Apache Transition News</div>
+ <h1>Apache NetBeans 9.0 Features</h1>
+ <p>
+ Full Java 9 Support, including <b>Jigsaw</b>, <b>JShell</b>, <b>JLink</b> and more.
+ </p>
+ <p><a class='button success' href="/download/nb90/index.html">Features</a></p>
+ </div>
+ </div>
+ </section>
+ </li>
+ <li class="orbit-slide">
+ <section class='hero alternate netbeans-bg-1'>
<div class='grid-container'>
<div class='cell'>
<div class='annotation'>Apache Transition News</div>
<h1>Apache NetBeans 9.0 Beta released!</h1>
<p>
- Apache NetBeans (incubating) 9.0 Beta is the Apache NetBeans incubator release
- of the NetBeans Java SE IDE.<br>With support for <b>Java 9</b>, <b>JShell</b>, <b>JLink</b>,
- <b>Jigsaw</b> and more!
+ Download the 9.0 beta from an Apache mirror near you.
</p>
- <p><a class='button success' href="/download/nb90-beta.html">Read more</a></p>
+ <p><a class='button success' href="/download/nb90/nb90-beta.html">Download</a></p>
</div>
</div>
</section>
</li>
<li class="is-active orbit-slide">
- <section class='hero alternate'>
+ <section class='hero alternate netbeans-bg'>
<div class='grid-container'>
<div class='cell'>
<div class='annotation'>Apache Transition News</div>
@@ -59,5 +71,6 @@
<nav class="orbit-bullets">
<button class="is-active" data-slide="0"><span class="show-for-sr">First slide details.</span><span class="show-for-sr">Current Slide</span></button>
<button data-slide="1"><span class="show-for-sr">Second slide details.</span></button>
+ <button data-slide="2"><span class="show-for-sr">Third slide details.</span></button>
</nav>
</div>
diff --git a/netbeans.apache.org/src/content/wiki/.htaccess b/netbeans.apache.org/src/content/wiki/.htaccess
index c74bac8..87fa94c 100644
--- a/netbeans.apache.org/src/content/wiki/.htaccess
+++ b/netbeans.apache.org/src/content/wiki/.htaccess
@@ -1 +1,2 @@
DirectoryIndex index.html index.asciidoc
+AddType text/html .asciidoc
diff --git a/netbeans.apache.org/src/content/wiki/FaqBlanketJCAForEmployees.asciidoc b/netbeans.apache.org/src/content/wiki/FaqBlanketJCAForEmployees.asciidoc
deleted file mode 100644
index 65f9200..0000000
--- a/netbeans.apache.org/src/content/wiki/FaqBlanketJCAForEmployees.asciidoc
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// 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.
-//
-
-= FaqBlanketJCAForEmployees
-:jbake-type: wiki
-:jbake-tags: wiki, devfaq, needsreview
-:jbake-status: published
-:keywords: Apache NetBeans wiki FaqBlanketJCAForEmployees
-:description: Apache NetBeans wiki FaqBlanketJCAForEmployees
-:toc: left
-:toc-title:
-:syntax: true
-
-=== Can my company sign a blanket CA for all its employees?
-
-Yes, a company can sign a blanket CA that will apply to all its employees. In that case, a person authorized to sign document on behalf of your company (usually a VP or higher) must sign the OCA, indicating his or her title. Please contact the Oracle project lead before submitting a company-wide OCA. Among other things, we want to understand who from your company will be authorized to make contributions.
-
-=== Apache Migration Information
-
-The content in this page was kindly donated by Oracle Corp. to the
-Apache Software Foundation.
-
-This page was exported from link:http://wiki.netbeans.org/FaqBlanketJCAForEmployees[http://wiki.netbeans.org/FaqBlanketJCAForEmployees] ,
-that was last modified by NetBeans user Jkovalsky
-on 2011-12-12T14:49:24Z.
-
-
-*NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/FaqCAAndRejectedContribution.asciidoc b/netbeans.apache.org/src/content/wiki/FaqCAAndRejectedContribution.asciidoc
deleted file mode 100644
index 824c876..0000000
--- a/netbeans.apache.org/src/content/wiki/FaqCAAndRejectedContribution.asciidoc
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// 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.
-//
-
-= FaqCAAndRejectedContribution
-:jbake-type: wiki
-:jbake-tags: wiki, devfaq, needsreview
-:jbake-status: published
-:keywords: Apache NetBeans wiki FaqCAAndRejectedContribution
-:description: Apache NetBeans wiki FaqCAAndRejectedContribution
-:toc: left
-:toc-title:
-:syntax: true
-
-=== I tried to make a contribution to netbeans.org and signed a CA, but my contribution was not accepted. What is the result?
-
-The CA is still effective, but that does not affect your ability to exercise ownership rights in your contribution.
-
-=== Apache Migration Information
-
-The content in this page was kindly donated by Oracle Corp. to the
-Apache Software Foundation.
-
-This page was exported from link:http://wiki.netbeans.org/FaqCAAndRejectedContribution[http://wiki.netbeans.org/FaqCAAndRejectedContribution] ,
-that was last modified by NetBeans user Admin
-on 2009-11-06T16:28:20Z.
-
-
-*NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/FaqCAForEveryContribution.asciidoc b/netbeans.apache.org/src/content/wiki/FaqCAForEveryContribution.asciidoc
deleted file mode 100644
index 9258f7a..0000000
--- a/netbeans.apache.org/src/content/wiki/FaqCAForEveryContribution.asciidoc
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// 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.
-//
-
-= FaqCAForEveryContribution
-:jbake-type: wiki
-:jbake-tags: wiki, devfaq, needsreview
-:jbake-status: published
-:keywords: Apache NetBeans wiki FaqCAForEveryContribution
-:description: Apache NetBeans wiki FaqCAForEveryContribution
-:toc: left
-:toc-title:
-:syntax: true
-
-=== Do I have to file a CA for every contribution?
-
-No, once you have a CA on file it will cover all your contributions to netbeans.org, and other projects owned or managed by Oracle, going forward. For more information, read link:FaqOtherSunCA.asciidoc[another FAQ].
-
-=== Apache Migration Information
-
-The content in this page was kindly donated by Oracle Corp. to the
-Apache Software Foundation.
-
-This page was exported from link:http://wiki.netbeans.org/FaqCAForEveryContribution[http://wiki.netbeans.org/FaqCAForEveryContribution] ,
-that was last modified by NetBeans user Skygo
-on 2013-12-16T13:22:45Z.
-
-
-*NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/FaqJCAAndCA.asciidoc b/netbeans.apache.org/src/content/wiki/FaqJCAAndCA.asciidoc
deleted file mode 100644
index 475031c..0000000
--- a/netbeans.apache.org/src/content/wiki/FaqJCAAndCA.asciidoc
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// 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.
-//
-
-= FaqJCAAndCA
-:jbake-type: wiki
-:jbake-tags: wiki, devfaq, needsreview
-:jbake-status: published
-:keywords: Apache NetBeans wiki FaqJCAAndCA
-:description: Apache NetBeans wiki FaqJCAAndCA
-:toc: left
-:toc-title:
-:syntax: true
-
-=== I've already signed a JCA; do I still have to sign the CA?
-
-If you've already signed a JCA for a contribution to netbeans.org, then you do not have to sign a CA for additional contributions. However, if you intend to contribute to other Oracle open source projects (such as GlassFish, MySQL or OpenJDK) in addition to netbeans.org, then you may wish to sign a new CA, which will cover all such projects.
-
-link:http://oss.oracle.com/oca.pdf[Oracle Contributor Agreement]
-
-=== Apache Migration Information
-
-The content in this page was kindly donated by Oracle Corp. to the
-Apache Software Foundation.
-
-This page was exported from link:http://wiki.netbeans.org/FaqJCAAndCA[http://wiki.netbeans.org/FaqJCAAndCA] ,
-that was last modified by NetBeans user Jkovalsky
-on 2011-12-12T13:56:00Z.
-
-
-*NOTE:* This document was automatically converted to the AsciiDoc format on 2018-02-07, and needs to be reviewed.
diff --git a/netbeans.apache.org/src/content/wiki/index.asciidoc b/netbeans.apache.org/src/content/wiki/index.asciidoc
index d3dea26..2f7a708 100644
--- a/netbeans.apache.org/src/content/wiki/index.asciidoc
+++ b/netbeans.apache.org/src/content/wiki/index.asciidoc
@@ -112,23 +112,6 @@
- link:DevFaqSystemFilesystem.asciidoc[What is the system filesystem?]
- link:DevFaqUserDir.asciidoc[What is the user directory, what is in it, and why do I need one?]
-=== Contributor Agreement
-
-- link:FaqBlanketJCAForEmployees.asciidoc[Can my company sign a blanket JCA for all its employees?]
-- link:FaqCAAndRejectedContribution.asciidoc[I tried to make a contribution to netbeans.org and signed a CA, but my contribution was not accepted. What is the result?]
-- link:FaqCAForEveryContribution.asciidoc[Do I have to file a CA for every contribution?]
-- link:FaqCanICancelCA.asciidoc[Once I have a CA on file, can I change my mind and cancel?]
-- link:FaqCanIFileByEmail.asciidoc[Can I file my completed CA by e-mail?]
-- link:FaqCompanyOrIndividualCA.asciidoc[If my company wants me to contribute changes, who should sign the CA, me or my company?]
-- link:FaqDoINeedACA.asciidoc[Do I have to fill out a CA?]
-- link:FaqHowDoIFileACA.asciidoc[How do I file a completed CA?]
-- link:FaqJCAAndCA.asciidoc[I've already signed a JCA; do I still have to sign the CA?]
-- link:FaqListedOnCopyright.asciidoc[I have a CA or JCA on file and I have made a code contribution to netbeans.org. Can I get listed on the copyright notice?]
-- link:FaqOtherSunCA.asciidoc[I've already signed a CA for another Oracle project, do I need to sign another one for NetBeans?]
-- link:FaqWhatIsCA.asciidoc[What is the Contributor Agreement ("CA")?]
-- link:FaqWhichVersionCA.asciidoc[I've already signed a recent version of the CA, do I need to sign the newest version?]
-- link:FaqWhyTheCA.asciidoc[Why does NetBeans request a CA?]
-
=== Converting between common data types and finding things
- link:DevFaqDataObjectFileObject.asciidoc[How do I get a DataObject for a FileObject?]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists