You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2018/02/26 19:34:25 UTC

svn commit: r1825406 - in /maven/archetypes/trunk/maven-archetype-site-skin/src: main/resources/archetype-resources/src/it/sample/ main/resources/archetype-resources/src/it/sample/src/site/ main/resources/archetype-resources/src/main/resources/META-INF...

Author: hboutemy
Date: Mon Feb 26 19:34:25 2018
New Revision: 1825406

URL: http://svn.apache.org/viewvc?rev=1825406&view=rev
Log:
[MARCHETYPES-59] little fixes (doc and license)

Modified:
    maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/src/site/site.xml
    maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/verify.groovy
    maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/skin.xml
    maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/maven-base.css
    maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/maven-theme.css
    maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/print.css
    maven/archetypes/trunk/maven-archetype-site-skin/src/site/apt/index.apt.vm

Modified: maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/src/site/site.xml?rev=1825406&r1=1825405&r2=1825406&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/src/site/site.xml (original)
+++ maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/src/site/site.xml Mon Feb 26 19:34:25 2018
@@ -1,26 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
-/*
- * 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.
- */
- -->
-
 <project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
   name="${skinName}">

Modified: maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/verify.groovy
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/verify.groovy?rev=1825406&r1=1825405&r2=1825406&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/verify.groovy (original)
+++ maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/it/sample/verify.groovy Mon Feb 26 19:34:25 2018
@@ -1,22 +1,3 @@
-/*
- * 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.
- */
-
 File index = new File( basedir, "target/site/index.html" )
 assert index.exists()
 

Modified: maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/skin.xml
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/skin.xml?rev=1825406&r1=1825405&r2=1825406&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/skin.xml (original)
+++ maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/skin.xml Mon Feb 26 19:34:25 2018
@@ -1,24 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
-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.
--->
-
 <skin xmlns="http://maven.apache.org/SKIN/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/SKIN/1.7.0 http://maven.apache.org/xsd/skin-1.7.0.xsd">
   <prerequisites>

Modified: maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/maven-base.css
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/maven-base.css?rev=1825406&r1=1825405&r2=1825406&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/maven-base.css (original)
+++ maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/maven-base.css Mon Feb 26 19:34:25 2018
@@ -1,22 +1,3 @@
-/*
- * 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.
- */
-
 body {
   margin: 0px;
   padding: 0px;

Modified: maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/maven-theme.css
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/maven-theme.css?rev=1825406&r1=1825405&r2=1825406&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/maven-theme.css (original)
+++ maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/maven-theme.css Mon Feb 26 19:34:25 2018
@@ -1,22 +1,3 @@
-/*
- * 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.
- */
-
 body {
   padding: 0px 0px 10px 0px;
 }

Modified: maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/print.css
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/print.css?rev=1825406&r1=1825405&r2=1825406&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/print.css (original)
+++ maven/archetypes/trunk/maven-archetype-site-skin/src/main/resources/archetype-resources/src/main/resources/css/print.css Mon Feb 26 19:34:25 2018
@@ -1,22 +1,3 @@
-/*
- * 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.
- */
-
 #banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
 	display: none !important;
 }

Modified: maven/archetypes/trunk/maven-archetype-site-skin/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-site-skin/src/site/apt/index.apt.vm?rev=1825406&r1=1825405&r2=1825406&view=diff
==============================================================================
--- maven/archetypes/trunk/maven-archetype-site-skin/src/site/apt/index.apt.vm (original)
+++ maven/archetypes/trunk/maven-archetype-site-skin/src/site/apt/index.apt.vm Mon Feb 26 19:34:25 2018
@@ -3,7 +3,7 @@
  ------
  Hervé Boutemy
  ------
- 2010-04-25
+ 2018-02-26
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -36,13 +36,33 @@ project
 |-- pom.xml
 `-- src
     |-- main
-    |   `-- java
-    |       `-- $package
-    |           `-- App.java
-    `-- test
-        `-- java
-            `-- $package
-                `-- AppTest.java
+    |   `-- resources
+    |       `-- META-INF
+    |           |-- css
+    |           |   |-- maven-base.css
+    |           |   |-- maven-theme.css
+    |           |   `-- print.css
+    |           |-- images
+    |           |   |-- external.png
+    |           |   |-- icon_error_sml.gif
+    |           |   |-- icon_info_sml.gif
+    |           |   |-- icon_success_sml.gif
+    |           |   |-- icon_warning_sml.gif
+    |           |   `-- newwindow.png
+    |           `-- maven
+    |               |-- site.vm
+    |               |-- site-macros.vm
+    |               `-- skin.xml
+    `-- it
+        |-- settings.xml
+        `-- sample
+            |-- pom.xml
+            `-- verify.groovy
+                `-- src
+                    `-- site
+                        |-- site.xml
+                        `-- apt
+                            `-- index.apt.vm
 
 +----+