You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/03/22 20:12:08 UTC

[5/9] git commit: Cleaned up root directory by adding a src folder.

Cleaned up root directory by adding a src folder.


Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/430f1d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/430f1d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/430f1d80

Branch: refs/heads/master
Commit: 430f1d80f009cb674bc5a851403537c65021218b
Parents: 64f1680
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Fri Mar 22 14:16:28 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Fri Mar 22 14:16:28 2013 -0400

----------------------------------------------------------------------
 STAGE            |   11 -----------
 VOTE             |   20 --------------------
 assembly.xml     |   38 --------------------------------------
 build.xml        |    4 ++--
 pom.xml          |    2 +-
 src/assembly.xml |   38 ++++++++++++++++++++++++++++++++++++++
 src/stage.txt    |   11 +++++++++++
 src/vote.txt     |   20 ++++++++++++++++++++
 8 files changed, 72 insertions(+), 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/430f1d80/STAGE
----------------------------------------------------------------------
diff --git a/STAGE b/STAGE
deleted file mode 100644
index be2496c..0000000
--- a/STAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-The release candidate has been prepared in:
-
-    target/${gateway-version}
-
-Please stage it to people.apache.org like this:
-
-    scp -r target/${gateway-version} people.apache.org:public_html/${gateway-project}/
-
-A release vote template has been generated here:
-
-    file://target/vote.txt

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/430f1d80/VOTE
----------------------------------------------------------------------
diff --git a/VOTE b/VOTE
deleted file mode 100644
index 4d4ff51..0000000
--- a/VOTE
+++ /dev/null
@@ -1,20 +0,0 @@
-From: ${release-manager}@apache.org
-To: dev@${gateway-project}.apache.org
-Subject: [VOTE] Release ${gateway-name} ${gateway-version}
-
-A candidate for the ${gateway-name} ${gateway-version} release is available at:
-
-http://people.apache.org/~${release-manager}/${gateway-project}/${gateway-version}/
-
-The release candidate is a zip archive of the sources in:
-
-http://svn.apache.org/repos/asf/${gateway-project}/tags/${gateway-version}/
-
-The SHA1 checksum of the archive is ${checksum}.
-
-Please vote on releasing this package as ${gateway-name} ${gateay-version}.
-The vote is open for the next 72 hours and passes if a majority of at
-least three +1 ${project-name} PMC votes are cast.
-
-[ ] +1 Release this package as ${gateway-name} ${gateway-version}
-[ ] -1 Do not release this package because...${line.separator}

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/430f1d80/assembly.xml
----------------------------------------------------------------------
diff --git a/assembly.xml b/assembly.xml
deleted file mode 100644
index 58ffa86..0000000
--- a/assembly.xml
+++ /dev/null
@@ -1,38 +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.
--->
-<assembly>
-    <id>src</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <directory></directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>**</include>
-            </includes>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/.idea/**</exclude>
-                <exclude>**/*.iml</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/430f1d80/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 0d3634d..ac3e336 100644
--- a/build.xml
+++ b/build.xml
@@ -104,12 +104,12 @@
             <arg value="KEYS"/>
         </exec>
         <checksum file="target/${gateway-artifact}-${gateway-version}-src.zip" algorithm="SHA1" property="checksum" />
-        <copy file="VOTE" tofile="target/vote.txt">
+        <copy file="src/vote.txt" tofile="target/vote.txt">
             <filterchain>
                 <expandproperties/>
             </filterchain>
         </copy>
-        <loadfile property="stage-message" srcFile="STAGE">
+        <loadfile property="stage-message" srcFile="src/stage.txt">
             <filterchain>
                 <expandproperties/>
             </filterchain>

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/430f1d80/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b2a4ab..d186126 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
                         <configuration>
                             <finalName>${gateway-artifact}-${gateway-version}</finalName>
                             <descriptors>
-                                <descriptor>assembly.xml</descriptor>
+                                <descriptor>src/assembly.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </execution>

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/430f1d80/src/assembly.xml
----------------------------------------------------------------------
diff --git a/src/assembly.xml b/src/assembly.xml
new file mode 100644
index 0000000..58ffa86
--- /dev/null
+++ b/src/assembly.xml
@@ -0,0 +1,38 @@
+<!--
+ 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.
+-->
+<assembly>
+    <id>src</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory></directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>**</include>
+            </includes>
+            <excludes>
+                <exclude>**/target/**</exclude>
+                <exclude>**/.project</exclude>
+                <exclude>**/.settings/**</exclude>
+                <exclude>**/.idea/**</exclude>
+                <exclude>**/*.iml</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/430f1d80/src/stage.txt
----------------------------------------------------------------------
diff --git a/src/stage.txt b/src/stage.txt
new file mode 100644
index 0000000..9dd2206
--- /dev/null
+++ b/src/stage.txt
@@ -0,0 +1,11 @@
+The release candidate has been prepared in:
+
+    target
+
+Please stage it to people.apache.org like this:
+
+    scp -r target people.apache.org:public_html/${gateway-project}/
+
+A release vote template has been generated here:
+
+    file://target/vote.txt

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/430f1d80/src/vote.txt
----------------------------------------------------------------------
diff --git a/src/vote.txt b/src/vote.txt
new file mode 100644
index 0000000..736406c
--- /dev/null
+++ b/src/vote.txt
@@ -0,0 +1,20 @@
+From: ${release-manager}@apache.org
+To: dev@${gateway-project}.apache.org
+Subject: [VOTE] Release ${gateway-name} ${gateway-version}
+
+A candidate for the ${gateway-name} ${gateway-version} release is available at:
+
+http://people.apache.org/~${release-manager}/${gateway-project}/${gateway-version}/
+
+The release candidate is a zip archive of the sources in:
+
+http://svn.apache.org/repos/asf/${gateway-project}/tags/${gateway-version}/
+
+The SHA1 checksum of the archive is ${checksum}.
+
+Please vote on releasing this package as ${gateway-name} ${gateway-version}.
+The vote is open for the next 72 hours and passes if a majority of at
+least three +1 ${gateway-name} PMC votes are cast.
+
+[ ] +1 Release this package as ${gateway-name} ${gateway-version}
+[ ] -1 Do not release this package because...${line.separator}