svn commit: r1038020 [1/3] - in /incubator/river/jtsk/skunk/surrogate: ./ nbproject/ src/org/apache/river/container/security/ test/org/apache/river/container/security/

[gt...@apache.org]

Author: gtrasuk
Date: Tue Nov 23 09:10:40 2010
New Revision: 1038020

URL: http://svn.apache.org/viewvc?rev=1038020&view=rev
Log:
Some build cleanups done (e.g. use Netbeans standard generated-sources directory).
First cut at security properties file tree generator complete and working.

Added:
    incubator/river/jtsk/skunk/surrogate/README.txt
    incubator/river/jtsk/skunk/surrogate/src/org/apache/river/container/security/ASTNode.java
    incubator/river/jtsk/skunk/surrogate/src/org/apache/river/container/security/Strings.java
Modified:
    incubator/river/jtsk/skunk/surrogate/build.xml
    incubator/river/jtsk/skunk/surrogate/nbproject/   (props changed)
    incubator/river/jtsk/skunk/surrogate/nbproject/build-impl.xml
    incubator/river/jtsk/skunk/surrogate/nbproject/genfiles.properties
    incubator/river/jtsk/skunk/surrogate/nbproject/project.properties
    incubator/river/jtsk/skunk/surrogate/nbproject/project.xml
    incubator/river/jtsk/skunk/surrogate/src/org/apache/river/container/security/PermissionFileParser.jjt
    incubator/river/jtsk/skunk/surrogate/test/org/apache/river/container/security/PermissionFileParserTest.java
    incubator/river/jtsk/skunk/surrogate/test/org/apache/river/container/security/sample.policy

Added: incubator/river/jtsk/skunk/surrogate/README.txt
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/surrogate/README.txt?rev=1038020&view=auto
==============================================================================
--- incubator/river/jtsk/skunk/surrogate/README.txt (added)
+++ incubator/river/jtsk/skunk/surrogate/README.txt Tue Nov 23 09:10:40 2010
@@ -0,0 +1,19 @@
+
+Building the Surrogate Container
+================================
+
+The container was originally built using Netbeans 6.9 and has the appropriate
+project contents checked into Subversion.
+
+To build correctly, you need to define a few libraries in Netbeans:  To do this,
+right-click on the RiverSurrogate node in the Projects tab and select
+"Properties", then select the "Libraries" node.  Define a library called
+'ApacheRiverPlatform' containing 'jsk-platform.jar' and 'jsk-resources.jar' from the
+River distribution.  Define another library called 'ApacheRiverLib' containing
+'jsk-lib.jar'.  The project properties should already include these libraries in
+the compile classpath.
+
+The property file parser is generated using the 'JavaCC' tool (version 5.0) currently
+available from 'https://javacc.dev.java.net/'.  Download and unpack the tool
+to a convenient location, then create a library as above called 'JavaCC' that
+contains the javacc home directory as its 'sources' directory.

Modified: incubator/river/jtsk/skunk/surrogate/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/surrogate/build.xml?rev=1038020&r1=1038019&r2=1038020&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/surrogate/build.xml (original)
+++ incubator/river/jtsk/skunk/surrogate/build.xml Tue Nov 23 09:10:40 2010
@@ -96,17 +96,16 @@
 
     <!-- Pre-compiler target to run javacc against our parser sources. -->
     <target name="-pre-compile">
-        <property name="javacc.home" value="C:/java_libs/javacc-5.0"/>
-        <mkdir dir="${basedir}/build/generated-src/org/apache/river/container/security"/>
+        <mkdir dir="${build.generated.sources.dir}/org/apache/river/container/security"/>
         <jjtree
             target="${basedir}/src/org/apache/river/container/security/PermissionFileParser.jjt"
-            outputdirectory="${basedir}/build/generated-src/org/apache/river/container/security"
-            javacchome="${javacc.home}"
+            outputdirectory="${build.generated.sources.dir}/org/apache/river/container/security"
+            javacchome="${libs.JavaCC.src}"
         />
         <javacc
-            target="${basedir}/build/generated-src/org/apache/river/container/security/PermissionFileParser.jj"
-            outputdirectory="${basedir}/build/generated-src/org/apache/river/container/security"
-            javacchome="${javacc.home}"
+            target="${build.generated.sources.dir}/org/apache/river/container/security/PermissionFileParser.jj"
+            outputdirectory="${build.generated.sources.dir}/org/apache/river/container/security"
+            javacchome="${libs.JavaCC.src}"
         />
     </target>
 </project>

Propchange: incubator/river/jtsk/skunk/surrogate/nbproject/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 23 09:10:40 2010
@@ -0,0 +1 @@
+private