isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1102652 - in /incubator/isis/trunk: STATUS addmissinglicenses.groovy bash_aliases mvn_aliases replace.groovy searchandreplace.groovy svn-st.sh svn-up-ie.sh svn-up.cmd svn-up.sh
Date Fri, 13 May 2011 10:30:22 GMT
Author: danhaywood
Date: Fri May 13 10:30:21 2011
New Revision: 1102652

URL: http://svn.apache.org/viewvc?rev=1102652&view=rev
Log:
ISIS-20: tidying up STATUS, deleting unused shell scripts; enhancing .groovy scripts

Added:
    incubator/isis/trunk/bash_aliases
      - copied, changed from r1102639, incubator/isis/trunk/mvn_aliases
    incubator/isis/trunk/searchandreplace.groovy
      - copied, changed from r1102639, incubator/isis/trunk/replace.groovy
Removed:
    incubator/isis/trunk/mvn_aliases
    incubator/isis/trunk/replace.groovy
    incubator/isis/trunk/svn-st.sh
    incubator/isis/trunk/svn-up-ie.sh
    incubator/isis/trunk/svn-up.cmd
    incubator/isis/trunk/svn-up.sh
Modified:
    incubator/isis/trunk/STATUS
    incubator/isis/trunk/addmissinglicenses.groovy

Modified: incubator/isis/trunk/STATUS
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/STATUS?rev=1102652&r1=1102651&r2=1102652&view=diff
==============================================================================
--- incubator/isis/trunk/STATUS (original)
+++ incubator/isis/trunk/STATUS Fri May 13 10:30:21 2011
@@ -1,6 +1,3 @@
-APACHE DERBY STATUS:
-Last modified at [$Date$] by $Author$.
-
 Web site: http://incubator.apache.org/isis/
 
 Project Status
@@ -47,34 +44,36 @@ OTHER NEWS
 RELEASE STATUS
 ==============
 
-The community is working towards a v0.1 release, which we hope will appear 
-by Jan 2011 if not before.
+Snapshot releases have been informally released to repository.apache.org.
+The community is working towards a formal v0.1 release.
 
 
 
 
-References:
+Resources:
  
-item            type       reference
-Status file     www        http://svn.apache.org/repos/asf/incubator/isis/trunk/STATUS
-Website         www        http://incubator.apache.org/isis/
-Mailing list    dev        isis-dev@incubator.apache.org
-Mailing list    users      isis-dev@incubator.apache.org  (nb: same as dev)
-Source code     SVN        /repos/asf/incubator/isis/trunk/
-Mentor  	    struberg    Mark Struberg
-Mentor  	    bimargulies Benson Margulies
-Mentor  	    sgoeschl    Siegfried Goeschl
-Mentor  	    jcarman     James W. Carman
-Mentor  	    vmassol     Vincent Massol
-Committer  	    danhaywood  Daniel Keir Haywood (CLA on file)
-Committer  	    rmatthews   Robert Charles Matthews (CLA on file)
-Committer  	    dslaughter  David Slaughter (CLA on file)
-Committer  	    kevin       Kevin Meyer (CLA on file)
-Committer  	    themalkolm  Alexander Krasnukhin (CLA on file)
-Committer  	    mnour       Mohammad Nour El-Din (CLA on file)
-Committer  	    uli         Ulrich Stärk (CLA on file)
-Committer  	    struberg    Mark Struberg (CLA on file)
-Committer  	    bimargulies Benson Margulies (CLA on file)
-Committer  	    sgoeschl    Siegfried Goeschl (CLA on file)
-Committer  	    jcarman     James W. Carman (CLA on file)
-Committer  	    vmassol     Vincent Massol (CLA on file)
+item           type   URL
+-------------  -----  -----------------------------------------------------
+Status file    www    http://svn.apache.org/repos/asf/incubator/isis/trunk/STATUS
+Website        www    http://incubator.apache.org/isis/
+Mailing list   dev    isis-dev@incubator.apache.org
+Mailing list   users  isis-dev@incubator.apache.org  (nb: same as dev)
+Source code    SVN    /repos/asf/incubator/isis/trunk/
+JIRA           www    http://issues.apache.org/jira/browse/ISIS
+Wiki           www    http://cwiki.apache.org/confluence/display/ISIS/Index
+CI             www    http://builds.apache.org/hudson/job/isis-trunk-windows
+
+Team:
+
+role(s)            user id      name
+-----------------  -----        ------------------------------
+Mentor, Committer  struberg     Mark Struberg
+Mentor, Committer  mnour        Mohammad Nour El-Din (CLA on file)
+Mentor, Committer  bimargulies  Benson Margulies
+Mentor, Committer  sgoeschl     Siegfried Goeschl
+Committer  	       danhaywood   Daniel Keir Haywood (CLA on file)
+Committer  	       rmatthews    Robert Charles Matthews (CLA on file)
+Committer          kevin        Kevin Meyer (CLA on file)
+Committer  	       dslaughter   David Slaughter (CLA on file)
+Committer  	       themalkolm   Alexander Krasnukhin (CLA on file)
+Committer  	       uli          Ulrich Stärk (CLA on file)

Modified: incubator/isis/trunk/addmissinglicenses.groovy
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/addmissinglicenses.groovy?rev=1102652&r1=1102651&r2=1102652&view=diff
==============================================================================
--- incubator/isis/trunk/addmissinglicenses.groovy (original)
+++ incubator/isis/trunk/addmissinglicenses.groovy Fri May 13 10:30:21 2011
@@ -1,17 +1,32 @@
-// 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.
+/*
+ * 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.
+ */
+
+def cli = new CliBuilder( usage: 'groovy replace [-xv]')
+cli.x(argName: 'exec', longOpt: 'exec', 'execute (perform changes if any found)'
+)
+cli.v(argName: 'verbose', longOpt: 'verbose', 'verbose')
+
+def options=cli.parse(args)
+
+if(options.x) {
+   println("-x (execute) flag specified: will make changes to files (if any replacements
found)")
+} else {
+   println("-x (execute) flag not specified: no changes will be made to files")
+}
 
 
 def license_using_c_style_comments="""/*
@@ -73,11 +88,12 @@ def license_using_hash_comments="""#  Li
 """
 
 
-def fileEndings = [".java"]
-//def fileEndings = [".xml", ".css", ".java", ".sh", ".properties"]
+//def fileEndings = [".java"]
+def fileEndings = [".xml", ".css", ".java", ".sh", ".properties", ".groovy"]
 
 def licenseTextByFileEnding = [
 	".java": license_using_c_style_comments,
+	".groovy": license_using_c_style_comments,
 	".css": license_using_c_style_comments,
 	".xml": license_using_xml_comments,
 	".properties": license_using_hash_comments,
@@ -90,14 +106,23 @@ def currentDir = new File(".");
 
 currentDir.eachFileRecurse { file ->
   fileEndings.each { fileEnding ->
-    if (file.name.endsWith(fileEnding)) {
-      def fileText = file.text;
+    if (! (file.canonicalPath =~ /[\\\/]target[\\\/]/)) {
+      if (file.name.endsWith(fileEnding)) {
+        def fileText = file.text;
+
+        def matchingText = fileText.find(".*Licensed to the Apache Software Foundation.*")
+        if(matchingText == null) {
+
+          if(options.v || ! options.x) {
+            println file.canonicalPath
+          }
+
+          if(options.x) {
+            file.write(licenseTextByFileEnding[fileEnding])
+            file.append(fileText)
+          }
 
-      def matchingText = fileText.find(".*Licensed to the Apache Software Foundation.*")
-      if(matchingText == null) {
-        println file.canonicalPath
-        file.write(licenseTextByFileEnding[fileEnding])
-        file.append(fileText)
+        }
       }    
     }
   }

Copied: incubator/isis/trunk/bash_aliases (from r1102639, incubator/isis/trunk/mvn_aliases)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/bash_aliases?p2=incubator/isis/trunk/bash_aliases&p1=incubator/isis/trunk/mvn_aliases&r1=1102639&r2=1102652&rev=1102652&view=diff
==============================================================================
--- incubator/isis/trunk/mvn_aliases (original)
+++ incubator/isis/trunk/bash_aliases Fri May 13 10:30:21 2011
@@ -13,13 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 # 
-# Intended to be sourced from a UNIX shell, eg
-# . mvn_aliases
+# Intended to be sourced from a UNIX shell, eg:
+#
+# . /path/to/isis/root/bash_aliases
 # 
+#
 
 alias mcia="mvn clean install -D modules=all -o"
 alias mci="mvn clean install -D modules=standard -o"
 
 alias msdf="mvn site-deploy -D modules=standard -D site=full -D deploy=local -o"
 alias msd="mvn site-deploy -D modules=standard -D deploy=local -o"
+
+alias svnst="svn status --ignore-externals | grep -v ^X"
+alias svnup="svn update --ignore-externals | grep -v ^X"
+

Copied: incubator/isis/trunk/searchandreplace.groovy (from r1102639, incubator/isis/trunk/replace.groovy)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/searchandreplace.groovy?p2=incubator/isis/trunk/searchandreplace.groovy&p1=incubator/isis/trunk/replace.groovy&r1=1102639&r2=1102652&rev=1102652&view=diff
==============================================================================
--- incubator/isis/trunk/replace.groovy (original)
+++ incubator/isis/trunk/searchandreplace.groovy Fri May 13 10:30:21 2011
@@ -70,7 +70,7 @@ currentDir.eachFileRecurse { file ->
     replacements.each { from, to -> 
       def newFileText = fileText.replaceAll(from, to)
       if(fileText != newFileText) {
-        if(options.v) {
+        if(options.v || !options.x) {
             println(file.path)
         }
         if(options.x) {



Mime
View raw message