jboss-svn-commits — JBoss SVN commit notifications

[Jboss-svn-commits] JBL Code SVN: r4748 - labs/jbossrules/trunk

[<jbo...@li...>]

Author: mic...@jb...
Date: 2006-06-12 22:56:13 -0400 (Mon, 12 Jun 2006)
New Revision: 4748

Added:
   labs/jbossrules/trunk/README_DEPENDENCIES.txt
Modified:
   labs/jbossrules/trunk/build.xml
Log:
added notes on depdenencies

Added: labs/jbossrules/trunk/README_DEPENDENCIES.txt
===================================================================
--- labs/jbossrules/trunk/README_DEPENDENCIES.txt	2006-06-13 02:04:04 UTC (rev 4747)
+++ labs/jbossrules/trunk/README_DEPENDENCIES.txt	2006-06-13 02:56:13 UTC (rev 4748)
@@ -0,0 +1,43 @@
+This is a summary of what jars you may need in your situation. Abbreviated names have been used (only the first part of the jar name) for brevity.
+
+CORE RUNTIME
+Runtime assumes that you are "compiling" rules using drools-compiler.
+
+    * drools-core - the rule engine itself.
+    * optional packages:
+          o xpp3, xstream - if you are using the file based audit feature
+          o jung, concurrent, colt, commons-collections, xercesImpl - only if you are using the visualisation feature (most people do this in the plug in - so not needed).
+
+Note you can use the drools-core stand-alone if you are compiling "outside" your runtime application, and deploying serialized Package or RuleBase? objects.
+
+COMPILER - rule assembly time
+Rule compiler takes rules in some textual format and prepares binary Packages of rules for deployment. This depends on the CORE RUNTIME.
+
+    * drools-core
+    * drools-compiler - the rule compiler itself.
+    * antlr3 - only if you are using native DRL. if only using XML, you can skip this.
+    * xerces, xml-apis - only if you are using XML rules, if DRL only, can skip this.
+    * commons-jci-core
+          o This also requires only one pair out of:
+                + commons-jci-eclipse, core-3.2 - for eclipse JDT to compile the java semantics (this is default)
+                + commons-jci-janino, janino - for janino. To use this option, set -Ddrools.compiler=true or use PackageBuilderConfiguration? class.
+    * commons-logging - used by various dependencies.
+    * commons-lang - used for string manipulation in various dependencies.
+    * stringtemplate, anlr-2.7.6 - used in generating semantic code.
+
+JSR-94
+This is the standard api for java rules (javax.rules). This depends on COMPILER.
+
+    * drools-jsr94 - the implementation of the standard
+    * jsr94-1.1 - the standard API for javax.rules.
+
+DECISION TABLES
+Decision tables use spreadsheets to generate rules.
+
+    * drools-compiler - required as rules are generated and compiled
+    * drools-decisiontables - contains the spreadsheet compiler for both XLS and CSV
+    * poi - for parsing Excel spreadsheets. If you are only using CSV, can skip this.
+
+The most common use case is for COMPILER - this allows rules to be loaded from their source form, and includes the runtime engine of course. For example, if you wanted to be able to load rules from a drl source you would need: drools-core and the COMPILER jars mentioned above (not xerces, and not xml-apis), and commons-jar-eclipse, core-3.2. You will only need optional core jars if you are using those features.
+
+When building from source, the dependencies are managed by maven. In each module, there is a pom.xml file that lists the exact dependencies. 
\ No newline at end of file

Modified: labs/jbossrules/trunk/build.xml
===================================================================
--- labs/jbossrules/trunk/build.xml	2006-06-13 02:04:04 UTC (rev 4747)
+++ labs/jbossrules/trunk/build.xml	2006-06-13 02:56:13 UTC (rev 4748)
@@ -657,7 +657,9 @@
             <zipfileset dir="drools-ide/lib"
                         includes="**/*.jar"
                         excludes="**/drools-*.jar" 
-                        prefix="lib" />                                                 
+                        prefix="lib" />  
+						
+			<zipfileset file="README_DEPENDENCIES.txt" prefix="lib" />
         </zip>
   
     </target>        

[Jboss-svn-commits] JBL Code SVN: r4747 - in labs/jbossrules/trunk/drools-compiler/src: main/resources/org/drools/semantics/java test/java/org/drools/integrationtests test/resources/org/drools/integrationtests

[<jbo...@li...>]

Author: mar...@jb...
Date: 2006-06-12 22:04:04 -0400 (Mon, 12 Jun 2006)
New Revision: 4747

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaInvokers.stg
   labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaRule.stg
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/globals_rule_test.drl
Log:
JBRULES-304 RuleBuilder incorrectly adds used identifiers for expressions
-Correct RuleBuilder to correctly pass used identifiers
-Correct templates to handle , for globals


Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaInvokers.stg
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaInvokers.stg	2006-06-12 22:12:18 UTC (rev 4746)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaInvokers.stg	2006-06-13 02:04:04 UTC (rev 4747)
@@ -68,7 +68,7 @@
         <globalTypes, globals:{ type, identifier | <type> <identifier> = ( <type> ) workingMemory.getGlobal( "<identifier>" );<\n>}>    
         
         return <ruleClassName>.<methodName>( 
-            <declarations:{ declr | <declr.identifier>}; separator=",\n"><if(globals)>,<endif>
+            <declarations:{ declr | <declr.identifier>}; separator=",\n"><if(globals)><if(declarations)>,<endif><endif>
 	        <globals:{ identifier | <identifier>}; separator=",\n"> );
     }    
     
@@ -131,7 +131,7 @@
         <globalTypes, globals:{ type, identifier | <type> <identifier> = ( <type> ) workingMemory.getGlobal( "<identifier>" );<\n>}>    
         
         return <ruleClassName>.<methodName>( 
-            <declarations:{ declr | <declr.identifier>}; separator=",\n"><if(globals)>,<endif>
+            <declarations:{ declr | <declr.identifier>}; separator=",\n"><if(globals)><if(declarations)>,<endif><endif>
 	        <globals:{ identifier | <identifier>}; separator=",\n"> );
     }
 

Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaRule.stg
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaRule.stg	2006-06-12 22:12:18 UTC (rev 4746)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaRule.stg	2006-06-13 02:04:04 UTC (rev 4747)
@@ -1,7 +1,7 @@
 group javaMethods;
 
 returnValueMethod(declarations, declarationTypes, globals, globalTypes, methodName, text) ::= <<
-public static Object <methodName>(<declarationTypes, declarations:{ type, declr | <type> <declr.identifier>}; separator=","><if(globals)>,<endif> <globalTypes, globals:{ type, identifier | <type> <identifier>}; separator=","> ) throws Exception {
+public static Object <methodName>(<declarationTypes, declarations:{ type, declr | <type> <declr.identifier>}; separator=","><if(globals)><if(declarations)>,<endif><endif> <globalTypes, globals:{ type, identifier | <type> <identifier>}; separator=","> ) throws Exception {
     return ( <text> );
 }
 >>
@@ -13,7 +13,7 @@
 >>
 
 evalMethod(declarations, declarationTypes, globals, globalTypes, methodName, text) ::= <<
-public static boolean <methodName>(<declarationTypes, declarations:{ type, declr | <type> <declr.identifier>}; separator=","><if(globals)>,<endif> <globalTypes, globals:{ type, identifier | <type> <identifier>}; separator=","> ) throws Exception {
+public static boolean <methodName>(<declarationTypes, declarations:{ type, declr | <type> <declr.identifier>}; separator=","><if(globals)><if(declarations)>,<endif><endif> <globalTypes, globals:{ type, identifier | <type> <identifier>}; separator=","> ) throws Exception {
     return ( <text> );
 }
 >>

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-06-12 22:12:18 UTC (rev 4746)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-06-13 02:04:04 UTC (rev 4747)
@@ -88,6 +88,9 @@
         final List list = new ArrayList();
         workingMemory.setGlobal( "list",
                                  list );
+        
+        workingMemory.setGlobal( "string",
+                                 "stilton" );        
 
         final Cheese stilton = new Cheese( "stilton",
                                      5 );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/globals_rule_test.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/globals_rule_test.drl	2006-06-12 22:12:18 UTC (rev 4746)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/globals_rule_test.drl	2006-06-13 02:04:04 UTC (rev 4747)
@@ -3,10 +3,14 @@
 import org.drools.Cheese;
 
 global java.util.List list
+global java.lang.String string
 
+
 rule "global rule test"
     when
-        Cheese( )
+        Cheese( $type : type ->  ( $type.equals( string ) ), type == ( string.toString() ) )
+        eval( string.equals( "stilton" ) )
+        eval( $type.equals( string ) )
     then
 		list.add( new Integer(5) );
 end    
\ No newline at end of file

[Jboss-svn-commits] JBL Code SVN: r4746 - labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess

[<jbo...@li...>]

Author: adamw
Date: 2006-06-12 18:12:18 -0400 (Mon, 12 Jun 2006)
New Revision: 4746

Modified:
   labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java
Log:
FileAccess bug fix

Modified: labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java
===================================================================
--- labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2006-06-12 17:01:03 UTC (rev 4745)
+++ labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2006-06-12 22:12:18 UTC (rev 4746)
@@ -49,7 +49,7 @@
 
     private void writeErrorMessage(HttpServletResponse response) throws IOException {
         response.setContentType("text/html");
-        response.getWriter().println(FileAccessServlet.ACCESS_DENIED);
+        response.getOutputStream().println(FileAccessServlet.ACCESS_DENIED);
     }
 
     protected void doGet(HttpServletRequest request, HttpServletResponse response)

[Jboss-svn-commits] JBL Code SVN: r4745 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: jfr...@jb...
Date: 2006-06-12 13:01:03 -0400 (Mon, 12 Jun 2006)
New Revision: 4745

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
typo


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-12 16:49:55 UTC (rev 4744)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-12 17:01:03 UTC (rev 4745)
@@ -376,10 +376,10 @@
 if ${BUILDFTT2}
 then
   # Remove files created by configure.
-  rm -r freetype-${FTT2VER}/builds/unix/config.status
-  rm -r freetype-${FTT2VER}/builds/unix/unix-def.mk
-  rm -r freetype-${FTT2VER}/builds/unix/freetype-config
-  rm -r freetype-${FTT2VER}/builds/unix/freetype2.pc
+  rm -f freetype-${FTT2VER}/builds/unix/config.status
+  rm -f freetype-${FTT2VER}/builds/unix/unix-def.mk
+  rm -f freetype-${FTT2VER}/builds/unix/freetype-config
+  rm -f freetype-${FTT2VER}/builds/unix/freetype2.pc
   # Extract and Build.
   Extract freetype ${FTT2URL} ${FTT2VER}
   Build freetype-${FTT2VER} ${TOOLS}/FTT2 "--enable-shared" "clean+libtool" ""

[Jboss-svn-commits] JBL Code SVN: r4744 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: jfr...@jb...
Date: 2006-06-12 12:49:55 -0400 (Mon, 12 Jun 2006)
New Revision: 4744

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Freetype2 does behave friendly when reconfiguring.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-12 16:20:21 UTC (rev 4743)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-12 16:49:55 UTC (rev 4744)
@@ -375,6 +375,12 @@
 # build freetype2 if required.
 if ${BUILDFTT2}
 then
+  # Remove files created by configure.
+  rm -r freetype-${FTT2VER}/builds/unix/config.status
+  rm -r freetype-${FTT2VER}/builds/unix/unix-def.mk
+  rm -r freetype-${FTT2VER}/builds/unix/freetype-config
+  rm -r freetype-${FTT2VER}/builds/unix/freetype2.pc
+  # Extract and Build.
   Extract freetype ${FTT2URL} ${FTT2VER}
   Build freetype-${FTT2VER} ${TOOLS}/FTT2 "--enable-shared" "clean+libtool" ""
   ADDCONF="$ADDCONF --with-freetype-dir=$TOOLS/FTT2"

[Jboss-svn-commits] JBL Code SVN: r4743 - labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess

[<jbo...@li...>]

Author: adamw
Date: 2006-06-12 12:20:21 -0400 (Mon, 12 Jun 2006)
New Revision: 4743

Modified:
   labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java
Log:
File access fix

Modified: labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java
===================================================================
--- labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2006-06-12 16:19:23 UTC (rev 4742)
+++ labs/shotoku/trunk/shotoku-file-access/src/java/org/jboss/shotoku/fileaccess/FileAccessServlet.java	2006-06-12 16:20:21 UTC (rev 4743)
@@ -105,8 +105,11 @@
             try {
                 Tools.transfer(ci.getIs(), os);
             } finally {
-                os.close();
-                ci.getIs().close();
+                try {
+                    os.close();
+                } finally {
+                    ci.getIs().close();
+                }
             }
         } catch (Exception e) {
             log.info("Unable to send a file.", e);

[Jboss-svn-commits] JBL Code SVN: r4742 - in labs/jbosslabs/trunk/portal-extensions/forge-ads: . src/java/org/jbosslabs/portlet/ads

[<jbo...@li...>]

Author: adamw
Date: 2006-06-12 12:19:23 -0400 (Mon, 12 Jun 2006)
New Revision: 4742

Added:
   labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml
Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java
Log:
Ads fix

Added: labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml	2006-06-12 15:47:43 UTC (rev 4741)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml	2006-06-12 16:19:23 UTC (rev 4742)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+  <component name="ModuleRootManager" />
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/target" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="shotoku-base" />
+    <orderEntry type="module" module-name="shotoku-aop" />
+    <orderEntry type="module" module-name="forge-common" />
+    <orderEntry type="library" name="jboss" level="application" />
+    <orderEntryProperties />
+  </component>
+</module>
+

Modified: labs/jbosslabs/trunk/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java	2006-06-12 15:47:43 UTC (rev 4741)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java	2006-06-12 16:19:23 UTC (rev 4742)
@@ -28,6 +28,7 @@
 import org.jboss.forge.common.projects.Projects;
 import org.jboss.forge.common.projects.ProjectsHelper;
 import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
+import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker;
 import org.jboss.portal.core.servlet.jsp.PortalJsp;
 import org.jboss.portal.common.context.DelegateContext;
 import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
@@ -62,10 +63,10 @@
     		Projects projects = ProjectsHelper.getProjects(portalName);
     		        	
         	DelegateContext context = projects.getProjectContext(
-        									new NullPermissionsChecker(),
+        									new RenderRequestPermissionsChecker(rReq),
         									projectId);
         	
-        	if ((context.childIterator("ads") != null)
+        	if ((context != null) && (context.childIterator("ads") != null)
         				&& context.childIterator("ads").hasNext()) {
         		return context;
         	} else { // If project ads are not specified show default ads 
@@ -115,7 +116,7 @@
         rReq.setAttribute(PortalJsp.CTX_REQUEST, content);
         writeJsp(rReq, rRes, fileName);
     }
-
+
     protected static String[] parse(String target) {
         String[] cnt;
         String[] separated;

[Jboss-svn-commits] JBL Code SVN: r4741 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: jfr...@jb...
Date: 2006-06-12 11:47:43 -0400 (Mon, 12 Jun 2006)
New Revision: 4741

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Remove the installed packages before building them.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-12 10:18:55 UTC (rev 4740)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-12 15:47:43 UTC (rev 4741)
@@ -128,17 +128,25 @@
 # $1 : Source base directory
 # $2 : Install directory
 # $3 : Additional parameters for that machines/product.
-# $4 : Additional make command
+# $4 : Parameter like additional make command
+#      depend : Do make depend
+#      libtool : copy libtool
+#      clean : remove existing installed dir.
 Build()
 {
 BASDIR=$1
 INSDIR=$2
 ADDCON=$3
-ADDINS=$4
+ADDOPE=$4
 SUBDIR=$5
 echo "************************* Configure in ${BASDIR} ********************"
-echo "prefix: ${INSDIR}"
-echo "parameters: ${ADDCON}"
+echo "parameters: --prefix=${INSDIR} ${ADDCON}"
+case "${ADDOPE}" in
+  *clean*)
+    echo "cleaning ${INSDIR}"
+    rm -rf ${INSDIR}
+    ;;
+esac
 if [ -z "${SUBDIR}" ]
 then
   SRCDIR=${BASDIR}
@@ -160,21 +168,23 @@
    echo "configure in ${SRCDIR} failed"
    exit 1
  fi
- if [ "$ADDINS" = "depend" ]
- then
-   make $ADDINS
-   if [ $? -ne 0 ]
-   then
-     echo "Make $ADDINS in ${SRCDIR} failed"
-     exit 1
-   fi
- fi
- if [ "$ADDINS" = "libtool" ]
- then
+ case "${ADDOPE}" in
+   *depend*)
+     make depend
+     if [ $? -ne 0 ]
+     then
+       echo "Make depend in ${SRCDIR} failed"
+       exit 1
+     fi
+     ;;
+ esac
+ case "${ADDOPE}" in
+   *libtool*)
    # On Solaris the libtool of old packages is broken
    # It does not build shared libraries.
+   echo "Copying libtool" 
    cp $TOOLS/bin/libtool .
- fi
+ esac
  make clean
  if [ $? -ne 0 ]
  then
@@ -193,15 +203,6 @@
    echo "Make install in ${SRCDIR} failed"
    exit 1
  fi
- if [ ! -z "$ADDINS" ] && [ "$ADDINS" != "depend" ]
- then
-   make $ADDINS
-   if [ $? -ne 0 ]
-   then
-     echo "Make $ADDINS in ${SRCDIR} failed"
-     exit 1
-   fi
- fi
 )
 }
 
@@ -375,7 +376,7 @@
 if ${BUILDFTT2}
 then
   Extract freetype ${FTT2URL} ${FTT2VER}
-  Build freetype-${FTT2VER} ${TOOLS}/FTT2 "--enable-shared" "" ""
+  Build freetype-${FTT2VER} ${TOOLS}/FTT2 "--enable-shared" "clean+libtool" ""
   ADDCONF="$ADDCONF --with-freetype-dir=$TOOLS/FTT2"
   LGDCONF="$LGDCONF --with-freetype=$TOOLS/FTT2"
 else
@@ -387,7 +388,7 @@
 if ${BUILDICNV}
 then
   Extract libiconv ${ICNVURL} ${ICNVVER}
-  Build libiconv-${ICNVVER} ${TOOLS}/ICNV "--enable-shared" "" ""
+  Build libiconv-${ICNVVER} ${TOOLS}/ICNV "--enable-shared" "clean" ""
   ADDCONF="$ADDCONF --with-iconv-dir=$TOOLS/ICNV"
   LGDCONF="$LGDCONF --with-libiconv-prefix=$TOOLS/ICNV"
 fi
@@ -398,7 +399,7 @@
 if ${BUILDMSQL}
 then
   Extract mysql ${MSQLURL} ${MSQLVER}
-  Build mysql-${MSQLVER} ${TOOLS}/MSQL "--enable-shared" "" ""
+  Build mysql-${MSQLVER} ${TOOLS}/MSQL "--enable-shared" "clean" ""
 fi
 
 #
@@ -406,7 +407,7 @@
 if ${BUILDKRB5}
 then
   Extract krb5 ${KRB5URL} ${KRB5VER}
-  Build krb5-${KRB5VER} ${TOOLS}/KRB5 "--enable-shared --with-tcl=no" "" "src"
+  Build krb5-${KRB5VER} ${TOOLS}/KRB5 "--enable-shared --with-tcl=no" "clean" "src"
   ADDCONF="$ADDCONF --with-kerberos=$TOOLS/KRB5"
 else
   if ${ALLOWCRYPTO}
@@ -422,7 +423,7 @@
 if ${BUILDGTTX}
 then
   Extract gettext ${GTTXURL} ${GTTXVER}
-  Build gettext-${GTTXVER} ${TOOLS}/GTTX "--enable-shared" "" ""
+  Build gettext-${GTTXVER} ${TOOLS}/GTTX "--enable-shared" "clean" ""
   ADDCONF="$ADDCONF --with-gettext=$TOOLS/GTTX"
 else
   ADDCONF="$ADDCONF --with-gettext"
@@ -433,6 +434,7 @@
 if ${BUILDJPEG}
 then
   # Directory are not created by jpeg installation...
+  rm -rf ${TOOLS}/JPEG
   mkdir -p ${TOOLS}/JPEG/include
   mkdir -p ${TOOLS}/JPEG/lib
   mkdir -p ${TOOLS}/JPEG/bin
@@ -450,7 +452,7 @@
 if ${BUILDLPNG}
 then
   Extract libpng ${LPNGURL} ${LPNGVER}
-  Build libpng-${LPNGVER} ${TOOLS}/LPNG ""  ""
+  Build libpng-${LPNGVER} ${TOOLS}/LPNG "clean"  ""
   ADDCONF="$ADDCONF --with-png-dir=$TOOLS/LPNG"
   LGDCONF="$LGDCONF --with-png=$TOOLS/LPNG"
   # libgd makes _very_ strange things with png.
@@ -471,7 +473,7 @@
 if ${BUILDLBGD}
 then
   Extract gd ${LBGDURL} ${LBGDVER}
-  Build gd-${LBGDVER} ${TOOLS}/LBGD "--without-xpm $LGDCONF"  ""
+  Build gd-${LBGDVER} ${TOOLS}/LBGD "--without-xpm $LGDCONF"  "clean" ""
   ADDCONF="$ADDCONF --with-gd=$TOOLS/LBGD \
           --enable-gd-native-ttf \
           "
@@ -486,7 +488,7 @@
 if ${BUILDXML2}
 then
   Extract libxml2 ${XML2URL} ${XML2VER}
-  Build libxml2-${XML2VER} ${TOOLS}/LIBXML2 ""  ""
+  Build libxml2-${XML2VER} ${TOOLS}/LIBXML2 "clean"  ""
   ADDCONF="$ADDCONF --with-libxml-dir=$TOOLS/LIBXML2"
 else
   ADDCONF="$ADDCONF --with-libxml-dir"
@@ -536,13 +538,13 @@
     export CPPFLAGS
     LDFLAGS=-L$TOOLS/SSL/lib
     export LDFLAGS
-    Build openldap-${LDAPVER} ${TOOLS}/LDAP "--with-threads --disable-slapd --with-tls=openssl" "depend"
+    Build openldap-${LDAPVER} ${TOOLS}/LDAP "--with-threads --disable-slapd --with-tls=openssl" "depend+clean" ""
   else
     if ${ALLOWCRYPTO}
     then
-      Build openldap-${LDAPVER} ${TOOLS}/LDAP "--with-threads --disable-slapd --with-tls"  ""
+      Build openldap-${LDAPVER} ${TOOLS}/LDAP "--with-threads --disable-slapd --with-tls"  "depend+clean" ""
     else
-      Build openldap-${LDAPVER} ${TOOLS}/LDAP "--with-threads --disable-slapd --without-tls --with-kerberos=no"  ""
+      Build openldap-${LDAPVER} ${TOOLS}/LDAP "--with-threads --disable-slapd --without-tls --with-kerberos=no"  "depend+clean" ""
     fi
   fi
   ADDCONF="$ADDCONF --with-ldap=$TOOLS/LDAP"
@@ -558,9 +560,9 @@
   Extract postgresql ${PSQLURL} ${PSQLVER}
   if ${BUILDOSSL}
   then
-    Build postgresql-${PSQLVER} ${TOOLS}/POSTGRESQL "--without-readline LDFLAGS=-L${TOOLS}/SSL/lib"  ""  ""
+    Build postgresql-${PSQLVER} ${TOOLS}/POSTGRESQL "--without-readline LDFLAGS=-L${TOOLS}/SSL/lib"  "clean"  ""
   else
-    Build postgresql-${PSQLVER} ${TOOLS}/POSTGRESQL --without-readline  ""  ""
+    Build postgresql-${PSQLVER} ${TOOLS}/POSTGRESQL --without-readline  "clean"  ""
   fi
   ADDCONF="$ADDCONF --with-pgsql=$TOOLS/POSTGRESQL --with-pdo-pgsql=$TOOLS/POSTGRESQL/bin"
 else

[Jboss-svn-commits] JBL Code SVN: r4740 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: jfr...@jb...
Date: 2006-06-12 06:18:55 -0400 (Mon, 12 Jun 2006)
New Revision: 4740

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
use tar to prevent duping files when symlinks.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-12 09:51:21 UTC (rev 4739)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-12 10:18:55 UTC (rev 4740)
@@ -206,6 +206,18 @@
 }
 
 #
+# Copy the file and the symlinks
+# $1 : source directory
+# $2 : file names (like "*.so*")
+# $3 : destination
+Copy()
+{
+(cd $1
+ tar cvf - $2 ) | (cd $3
+ tar xvf - )
+}
+
+#
 # Allow to parameters to the build
 n=$#
 for ((i=0 ; i<$n ; i=`expr $i + 1`))
@@ -752,52 +764,52 @@
 # Copy the libraries to php/lib
 if ${BUILDKRB5}
 then
-  cp -p $TOOLS/KRB5/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/KRB5/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDGTTX}
 then
-  cp -p $TOOLS/GTTX/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/GTTX/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDXML2}
 then
-  cp -p $TOOLS/LIBXML2/lib/libxml2.so* $TOOLS/PHP/lib
+  Copy $TOOLS/LIBXML2/lib "libxml2.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDPSQL}
 then
-  cp -p $TOOLS/POSTGRESQL/lib/libpq.so* $TOOLS/PHP/lib
+  Copy $TOOLS/POSTGRESQL/lib "libpq.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDOSSL}
 then
-  cp -p $TOOLS/SSL/lib/libcrypto.so* $TOOLS/PHP/lib
-  cp -p $TOOLS/SSL/lib/libssl.so* $TOOLS/PHP/lib
+  Copy $TOOLS/SSL/lib "libcrypto.so*" $TOOLS/PHP/lib
+  Copy $TOOLS/SSL/lib "libssl.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDLPNG}
 then
-  cp -p $TOOLS/LPNG/lib/libpng12.so* $TOOLS/PHP/lib
+  Copy $TOOLS/LPNG/lib "libpng12.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDJPEG}
 then
-  cp -p $TOOLS/JPEG/lib/libjpeg.so* $TOOLS/PHP/lib
+  Copy $TOOLS/JPEG/lib "libjpeg.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDMSQL}
 then
-  cp -p $TOOLS/MSQL/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/MSQL/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDLDAP}
 then
-  cp -p $TOOLS/LDAP/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/LDAP/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDICNV}
 then
-  cp -p $TOOLS/ICNV/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/ICNV/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDFTT2}
 then
-  cp -p $TOOLS/FTT2/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/FTT2/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 if ${BUILDLBGD}
 then
-  cp -p $TOOLS/LBGD/lib/lib*.so* $TOOLS/PHP/lib
+  Copy $TOOLS/LBGD/lib "lib*.so*" $TOOLS/PHP/lib
 fi
 
 #

[Jboss-svn-commits] JBL Code SVN: r4739 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: jfr...@jb...
Date: 2006-06-12 05:51:21 -0400 (Mon, 12 Jun 2006)
New Revision: 4739

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Arrange jpeg and png detection in gd (note gd's configure is buggy).


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-11 22:02:16 UTC (rev 4738)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-12 09:51:21 UTC (rev 4739)
@@ -169,6 +169,12 @@
      exit 1
    fi
  fi
+ if [ "$ADDINS" = "libtool" ]
+ then
+   # On Solaris the libtool of old packages is broken
+   # It does not build shared libraries.
+   cp $TOOLS/bin/libtool .
+ fi
  make clean
  if [ $? -ne 0 ]
  then
@@ -420,7 +426,7 @@
   mkdir -p ${TOOLS}/JPEG/bin
   mkdir -p ${TOOLS}/JPEG/man/man1
   Extract jpeg ${JPEGURL} ${JPEGVER}
-  Build jpeg-${JPEGVER} ${TOOLS}/JPEG "--enable-shared" "" ""
+  Build jpeg-${JPEGVER} ${TOOLS}/JPEG "--enable-shared" "libtool" ""
   ADDCONF="$ADDCONF --with-jpeg-dir=$TOOLS/JPEG"
   LGDCONF="$LGDCONF --with-jpeg=$TOOLS/JPEG"
 else
@@ -439,6 +445,8 @@
   LIBPNG_CONFIG=${TOOLS}/LPNG/bin/libpng-config
   LIBPNG12_CONFIG=${TOOLS}/LPNG/bin/libpng12-config
   CPPFLAGS="$CPPFLAGS -I${TOOLS}/LPNG/include/libpng12"
+  PATH=${TOOLS}/LPNG/bin:$PATH
+  export PATH
   export LIBPNG_CONFIG
   export LIBPNG12_CONFIG
   export CPPFLAGS

[Jboss-svn-commits] JBL Code SVN: r4738 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: jfr...@jb...
Date: 2006-06-11 18:02:16 -0400 (Sun, 11 Jun 2006)
New Revision: 4738

Modified:
   labs/jbossweb/trunk/src/share/native/build/php.xml
Log:
Make index.php welcome page. (thanks Mladen).


Modified: labs/jbossweb/trunk/src/share/native/build/php.xml
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/php.xml	2006-06-11 17:15:30 UTC (rev 4737)
+++ labs/jbossweb/trunk/src/share/native/build/php.xml	2006-06-11 22:02:16 UTC (rev 4738)
@@ -9,6 +9,10 @@
   <description>
      Welcome to JBoss Web PHP demo
   </description>
+  <welcome-file-list>
+    <welcome-file>index.php</welcome-file>
+  </welcome-file-list>
+
   <servlet>
     <servlet-name>php</servlet-name>
     <servlet-class>org.apache.catalina.servlets.php.Handler</servlet-class>

[Jboss-svn-commits] JBL Code SVN: r4737 - labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper

[<jbo...@li...>]

Author: adamw
Date: 2006-06-11 13:15:30 -0400 (Sun, 11 Jun 2006)
New Revision: 4737

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java
Log:


Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java	2006-06-11 17:03:42 UTC (rev 4736)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java	2006-06-11 17:15:30 UTC (rev 4737)
@@ -208,7 +208,6 @@
                     return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE);
                 }
             } catch (Exception e) {
-                e.printStackTrace();
                 return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE);
             }
 

[Jboss-svn-commits] JBL Code SVN: r4736 - labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper

[<jbo...@li...>]

Author: adamw
Date: 2006-06-11 13:03:42 -0400 (Sun, 11 Jun 2006)
New Revision: 4736

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java
Log:
Mapper fix

Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java	2006-06-11 16:06:12 UTC (rev 4735)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java	2006-06-11 17:03:42 UTC (rev 4736)
@@ -205,8 +205,11 @@
             try {
                 if (!Constants.PAGES_MIME_TYPE.equalsIgnoreCase(cm.getNode(cmsPath).getMimeType())) {
                     sendRedirect(invocation, "/" + ForgeHelper.FILE_ACCESS_DIR + "/" + cmsPath);
+                    return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE);
                 }
             } catch (Exception e) {
+                e.printStackTrace();
+                return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE);
             }
 
             setAttribute(invocation, Constants.ATTR_REQ_PATH, cmsPath);

[Jboss-svn-commits] JBL Code SVN: r4735 - labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper

[<jbo...@li...>]

Author: adamw
Date: 2006-06-11 12:06:12 -0400 (Sun, 11 Jun 2006)
New Revision: 4735

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java
Log:
Bug fix


Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java	2006-06-11 14:45:27 UTC (rev 4734)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java	2006-06-11 16:06:12 UTC (rev 4735)
@@ -101,7 +101,6 @@
         return (s == null) || ("".equals(s));
     }
 
-    @Inject
     private ContentManager cm;
 
     private void setParamIfNotNull(Parameters params, String name, String value) {
@@ -208,7 +207,6 @@
                     sendRedirect(invocation, "/" + ForgeHelper.FILE_ACCESS_DIR + "/" + cmsPath);
                 }
             } catch (Exception e) {
-
             }
 
             setAttribute(invocation, Constants.ATTR_REQ_PATH, cmsPath);
@@ -279,10 +277,6 @@
     public ControllerCommand doMapping(ServerInvocation invocation,
                                        String portalContextPath, String portalRequestPath)
             throws InvocationException, InvocationRuntimeException {
-        /* TODO remove
-        System.out.println("REQUEST: " + portalRequestPath +
-                " ?" + invocation.getRequest().getContext().getClientRequest().getQueryString());*/
-
         // TODO temporary for freezone
         String projectParam = invocation.getRequest().getContext().getClientRequest()
                 .getParameter(Constants.PROJECT_PARAM);
@@ -290,6 +284,8 @@
             setAttribute(invocation, Constants.PROJECT_PARAM, projectParam);
         }
 
+
+
         // Removing unnecessary /.
         while (portalRequestPath.indexOf("//") != -1) {
             portalRequestPath = portalRequestPath.replace("//", "/");
@@ -430,7 +426,7 @@
 
     @Override
     protected void startService() throws Exception {
-
+        cm = ContentManager.getContentManager();
     }
 
     @Override

[Jboss-svn-commits] JBL Code SVN: r4734 - in labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar: META-INF conf/hibernate/instance conf/hibernate/portal conf/hibernate/security conf/hibernate/user lib portal-cms.sar portal-cms.sar/META-INF portal-cms.war/META-INF portal-core.war/META-INF portal-samples.war/META-INF portal-samples.war/WEB-INF portal-server.war/META-INF

[<jbo...@li...>]

Author: adamw
Date: 2006-06-11 10:45:27 -0400 (Sun, 11 Jun 2006)
New Revision: 4734

Added:
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml
Modified:
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/ehcache.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-faces-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms-lib.jar
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF
   labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF
Log:
Portal 2.2.1 SP1

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF	2006-06-11 14:45:27 UTC (rev 4734)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.6.5
-Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.)
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")
 

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml	2006-06-11 14:45:27 UTC (rev 4734)
@@ -0,0 +1,38 @@
+<ehcache>
+
+    <!-- Sets the path to the directory where cache .data files are created.
+
+         If the path is a Java System Property it is replaced by
+         its value in the running VM.
+
+         The following properties are translated:
+         user.home - User's home directory
+         user.dir - User's current working directory
+         java.io.tmpdir - Default temp file path -->
+    <diskStore path="java.io.tmpdir/instance"/>
+
+
+    <!--Default Cache configuration. These will applied to caches programmatically created through
+        the CacheManager.
+
+        The following attributes are required for defaultCache:
+
+        maxInMemory       - Sets the maximum number of objects that will be created in memory
+        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
+                            is never expired.
+        timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+                            if the element is not eternal. Idle time is now - last accessed time
+        timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+                            if the element is not eternal. TTL is now - creation time
+        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
+                            has reached the maxInMemory limit.
+
+        -->
+    <defaultCache
+        maxElementsInMemory="10000"
+        eternal="false"
+        timeToIdleSeconds="120"
+        timeToLiveSeconds="120"
+        overflowToDisk="false"
+        />
+</ehcache>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml	2006-06-11 14:45:27 UTC (rev 4734)
@@ -8,6 +8,7 @@
       <property name="show_sql">false</property>
       <property name="cache.use_second_level_cache">true</property>
       <property name="cache.use_query_cache">true</property>
+      <property name="cache.provider_configuration_file_resource_path">conf/hibernate/instance/ehcache.xml</property>
 
       <!--
          | Uncomment in clustered mode : use transactional replicated cache

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml	2006-06-11 14:45:27 UTC (rev 4734)
@@ -0,0 +1,38 @@
+<ehcache>
+
+    <!-- Sets the path to the directory where cache .data files are created.
+
+         If the path is a Java System Property it is replaced by
+         its value in the running VM.
+
+         The following properties are translated:
+         user.home - User's home directory
+         user.dir - User's current working directory
+         java.io.tmpdir - Default temp file path -->
+    <diskStore path="java.io.tmpdir/portal"/>
+
+
+    <!--Default Cache configuration. These will applied to caches programmatically created through
+        the CacheManager.
+
+        The following attributes are required for defaultCache:
+
+        maxInMemory       - Sets the maximum number of objects that will be created in memory
+        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
+                            is never expired.
+        timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+                            if the element is not eternal. Idle time is now - last accessed time
+        timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+                            if the element is not eternal. TTL is now - creation time
+        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
+                            has reached the maxInMemory limit.
+
+        -->
+    <defaultCache
+        maxElementsInMemory="10000"
+        eternal="false"
+        timeToIdleSeconds="120"
+        timeToLiveSeconds="120"
+        overflowToDisk="false"
+        />
+</ehcache>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml	2006-06-11 14:45:27 UTC (rev 4734)
@@ -8,6 +8,7 @@
       <property name="show_sql">false</property>
       <property name="cache.use_second_level_cache">true</property>
       <property name="cache.use_query_cache">true</property>
+      <property name="cache.provider_configuration_file_resource_path">conf/hibernate/portal/ehcache.xml</property>
 
       <!--
          | Uncomment in clustered mode : use transactional replicated cache

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml	2006-06-11 14:45:27 UTC (rev 4734)
@@ -0,0 +1,38 @@
+<ehcache>
+
+    <!-- Sets the path to the directory where cache .data files are created.
+
+         If the path is a Java System Property it is replaced by
+         its value in the running VM.
+
+         The following properties are translated:
+         user.home - User's home directory
+         user.dir - User's current working directory
+         java.io.tmpdir - Default temp file path -->
+    <diskStore path="java.io.tmpdir/security"/>
+
+
+    <!--Default Cache configuration. These will applied to caches programmatically created through
+        the CacheManager.
+
+        The following attributes are required for defaultCache:
+
+        maxInMemory       - Sets the maximum number of objects that will be created in memory
+        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
+                            is never expired.
+        timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+                            if the element is not eternal. Idle time is now - last accessed time
+        timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+                            if the element is not eternal. TTL is now - creation time
+        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
+                            has reached the maxInMemory limit.
+
+        -->
+    <defaultCache
+        maxElementsInMemory="10000"
+        eternal="false"
+        timeToIdleSeconds="120"
+        timeToLiveSeconds="120"
+        overflowToDisk="false"
+        />
+</ehcache>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml	2006-06-11 14:45:27 UTC (rev 4734)
@@ -11,6 +11,7 @@
       <property name="transaction.auto_close_session">false</property>
       <property name="transaction.flush_before_completion">false</property>
       <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+      <property name="cache.provider_configuration_file_resource_path">conf/hibernate/security/ehcache.xml</property>
 
       <!-- Force the dialect instead of using autodetection -->
       <!--

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml	2006-06-11 14:45:27 UTC (rev 4734)
@@ -0,0 +1,38 @@
+<ehcache>
+
+    <!-- Sets the path to the directory where cache .data files are created.
+
+         If the path is a Java System Property it is replaced by
+         its value in the running VM.
+
+         The following properties are translated:
+         user.home - User's home directory
+         user.dir - User's current working directory
+         java.io.tmpdir - Default temp file path -->
+    <diskStore path="java.io.tmpdir/user"/>
+
+
+    <!--Default Cache configuration. These will applied to caches programmatically created through
+        the CacheManager.
+
+        The following attributes are required for defaultCache:
+
+        maxInMemory       - Sets the maximum number of objects that will be created in memory
+        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
+                            is never expired.
+        timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+                            if the element is not eternal. Idle time is now - last accessed time
+        timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+                            if the element is not eternal. TTL is now - creation time
+        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
+                            has reached the maxInMemory limit.
+
+        -->
+    <defaultCache
+        maxElementsInMemory="10000"
+        eternal="false"
+        timeToIdleSeconds="120"
+        timeToLiveSeconds="120"
+        overflowToDisk="false"
+        />
+</ehcache>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml	2006-06-11 14:45:27 UTC (rev 4734)
@@ -8,6 +8,7 @@
       <property name="show_sql">false</property>
       <property name="cache.use_second_level_cache">true</property>
       <property name="cache.use_query_cache">true</property>
+      <property name="cache.provider_configuration_file_resource_path">conf/hibernate/user/ehcache.xml</property>
 
       <!--
          | Uncomment in clustered mode : use transactional replicated cache

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/ehcache.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-faces-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF	2006-06-11 14:45:27 UTC (rev 4734)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.6.5
-Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.)
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")
 

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF	2006-06-11 14:45:27 UTC (rev 4734)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.6.5
-Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.)
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")
 

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF	2006-06-11 14:45:27 UTC (rev 4734)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.6.5
-Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.)
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")
 

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF	2006-06-11 14:45:27 UTC (rev 4734)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.6.5
-Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.)
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")
 

Added: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml	2006-06-11 14:45:27 UTC (rev 4734)
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+   <listener>
+      <listener-class> org.jboss.portal.portlet.session.SessionListener </listener-class>
+   </listener>
+</web-app>

Modified: labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF	2006-06-11 11:46:36 UTC (rev 4733)
+++ labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF	2006-06-11 14:45:27 UTC (rev 4734)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.6.5
-Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.)
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")
 

[Jboss-svn-commits] JBL Code SVN: r4733 - labs/shotoku/trunk/shotoku-aop/src/java/org/jboss/shotoku/aop

[<jbo...@li...>]

Author: adamw
Date: 2006-06-11 07:46:36 -0400 (Sun, 11 Jun 2006)
New Revision: 4733

Modified:
   labs/shotoku/trunk/shotoku-aop/src/java/org/jboss/shotoku/aop/CacheInjectAspect.java
Log:
Bug fixes

Modified: labs/shotoku/trunk/shotoku-aop/src/java/org/jboss/shotoku/aop/CacheInjectAspect.java
===================================================================
--- labs/shotoku/trunk/shotoku-aop/src/java/org/jboss/shotoku/aop/CacheInjectAspect.java	2006-06-11 10:43:54 UTC (rev 4732)
+++ labs/shotoku/trunk/shotoku-aop/src/java/org/jboss/shotoku/aop/CacheInjectAspect.java	2006-06-11 11:46:36 UTC (rev 4733)
@@ -32,30 +32,35 @@
  */
 @Aspect(scope=Scope.PER_JOINPOINT)
 public class CacheInjectAspect {
-    ShotokuCacheItem sci;
+    private final static Object synchronizer = new Object();
+    private ShotokuCacheItem sci;
 
     private CacheItem getCurrentAnnotation(FieldInvocation invocation) {
-		CacheItem current = invocation.getField().getAnnotation(CacheItem.class);
-		if (current == null)
-			throw new RuntimeException("This aspect should be used only with " +
-					"@CacheItem!");
+        CacheItem current = invocation.getField().getAnnotation(CacheItem.class);
+        if (current == null)
+            throw new RuntimeException("This aspect should be used only with " +
+                    "@CacheItem!");
 
-		return current;
-	}
+        return current;
+    }
 
     @Bind(pointcut="field($instanceof{org.jboss.shotoku.cache.ShotokuCacheItem} " +
             "*->@org.jboss.shotoku.aop.CacheItem)")
     public Object accessCacheItem(FieldReadInvocation invocation) throws Throwable {
         if (sci == null) {
-            CacheItem ci = getCurrentAnnotation(invocation);
+            synchronized(synchronizer) {
+                if (sci == null) {
+                    CacheItem ci = getCurrentAnnotation(invocation);
 
-            if (ci.interval() == 0) {
-                sci = (ShotokuCacheItem)
-                    invocation.getField().getType().getConstructor().newInstance();
-            } else {
-                sci = (ShotokuCacheItem)
-                    invocation.getField().getType().getConstructor(Long.TYPE).newInstance(
-                            ci.interval());
+                    if (ci.interval() == 0) {
+                        sci = (ShotokuCacheItem)
+                                invocation.getField().getType().getConstructor().newInstance();
+                    } else {
+                        sci = (ShotokuCacheItem)
+                                invocation.getField().getType().getConstructor(Long.TYPE).newInstance(
+                                        ci.interval());
+                    }
+                }
             }
         }
 

[Jboss-svn-commits] JBL Code SVN: r4732 - labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service

[<jbo...@li...>]

Author: adamw
Date: 2006-06-11 06:43:54 -0400 (Sun, 11 Jun 2006)
New Revision: 4732

Added:
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/Null.java
Modified:
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java
Log:
Blog update

Added: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/Null.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/Null.java	2006-06-11 10:43:34 UTC (rev 4731)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/Null.java	2006-06-11 10:43:54 UTC (rev 4732)
@@ -0,0 +1,19 @@
+package org.jboss.shotoku.service;
+
+/**
+ * @author Adam Warski (ad...@as...)
+ */
+public class Null {
+    private Null() { }
+
+    private static Null instance = new Null();
+    public static Null getInstance() { return instance; }
+
+    public boolean equals(Object obj) {
+        return obj instanceof Null;
+    }
+
+    public int hashCode() {
+        return 0;
+    }
+}

Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java	2006-06-11 10:43:34 UTC (rev 4731)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java	2006-06-11 10:43:54 UTC (rev 4732)
@@ -130,11 +130,20 @@
             new ConcurrentHashSet<ShotokuCacheItem>();
 
     public Object get(Object key) {
-        return cache.get(key);
+        Object ret = cache.get(key);
+        if (Null.getInstance().equals(ret)) {
+            return null;
+        } else {
+            return ret;
+        }
     }
 
     public void put(Object key, Object o) {
-        cache.put(key, o);
+        if (o == null) {
+            cache.put(key, Null.getInstance());
+        } else {
+            cache.put(key, o);
+        }
     }
 
     public void remove(Object key) {
@@ -188,7 +197,8 @@
         sb.append("and ").append(cacheItems.size()).append(" ShotokuCacheItem objects.<br />");
         sb.append("Objects in cache:<br />");
         for (Object key : cache.keySet()) {
-            sb.append(key.toString() + " : " + cache.get(key).getClass().getName()).append("<br />");
+            sb.append(key.toString()).append(" : ").append(
+                    cache.get(key).getClass().getName()).append("<br />");
         }
 
         sb.append("Cache items:<br />");

[Jboss-svn-commits] JBL Code SVN: r4731 - labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog

[<jbo...@li...>]

Author: adamw
Date: 2006-06-11 06:43:34 -0400 (Sun, 11 Jun 2006)
New Revision: 4731

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java
Log:
Blog update

Modified: labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java	2006-06-11 10:28:47 UTC (rev 4730)
+++ labs/jbosslabs/trunk/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java	2006-06-11 10:43:34 UTC (rev 4731)
@@ -176,6 +176,10 @@
         SyndFeed feed = blogFeed.get(new Triple<String, String, String>(portalName, projectId,
                 feedAddress));
 
+        if (feed == null) {
+            return;
+        }
+
         WindowState ws = request.getWindowState();
 
         String currentWindowState = "maximized";

[Jboss-svn-commits] JBL Code SVN: r4730 - labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service

[<jbo...@li...>]

Author: adamw
Date: 2006-06-11 06:28:47 -0400 (Sun, 11 Jun 2006)
New Revision: 4730

Modified:
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java
Log:
More debug info

Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java	2006-06-11 10:25:46 UTC (rev 4729)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java	2006-06-11 10:28:47 UTC (rev 4730)
@@ -188,7 +188,7 @@
         sb.append("and ").append(cacheItems.size()).append(" ShotokuCacheItem objects.<br />");
         sb.append("Objects in cache:<br />");
         for (Object key : cache.keySet()) {
-            sb.append(key.toString()).append("<br />");
+            sb.append(key.toString() + " : " + cache.get(key).getClass().getName()).append("<br />");
         }
 
         sb.append("Cache items:<br />");

[Jboss-svn-commits] JBL Code SVN: r4729 - in labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku: service tools

[<jbo...@li...>]

Author: adamw
Date: 2006-06-11 06:25:46 -0400 (Sun, 11 Jun 2006)
New Revision: 4729

Modified:
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Pair.java
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Triple.java
Log:
More debug info

Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java	2006-06-11 09:53:16 UTC (rev 4728)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java	2006-06-11 10:25:46 UTC (rev 4729)
@@ -183,8 +183,20 @@
     }
 
     public String getServiceDescription() {
-        return "Cache service; currently storing " + cache.size() + " items in the cache and " +
-                cacheItems.size() + " ShotokuCacheItem objects.";
+        StringBuffer sb = new StringBuffer("Cache service.<br />");
+        sb.append("Currently storing ").append(cache.size()).append(" items in the cache ");
+        sb.append("and ").append(cacheItems.size()).append(" ShotokuCacheItem objects.<br />");
+        sb.append("Objects in cache:<br />");
+        for (Object key : cache.keySet()) {
+            sb.append(key.toString()).append("<br />");
+        }
+
+        sb.append("Cache items:<br />");
+        for (ShotokuCacheItem sci : cacheItems) {
+            sb.append(sci.getClass().getName()).append("<br />");
+        }
+
+        return sb.toString();
     }
 
     /*

Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Pair.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Pair.java	2006-06-11 09:53:16 UTC (rev 4728)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Pair.java	2006-06-11 10:25:46 UTC (rev 4729)
@@ -56,4 +56,8 @@
     public int hashCode() {
         return obj1.hashCode() + obj2.hashCode();
     }
+
+    public String toString() {
+        return "(" + obj1.toString() + ", " + obj2.toString() + ")";
+    }
 }

Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Triple.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Triple.java	2006-06-11 09:53:16 UTC (rev 4728)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/tools/Triple.java	2006-06-11 10:25:46 UTC (rev 4729)
@@ -43,4 +43,8 @@
     public int hashCode() {
         return obj1.hashCode() + obj2.hashCode() + obj3.hashCode();
     }
+
+    public String toString() {
+        return "(" + obj1.toString() + ", " + obj2.toString()+ ", " + obj3.toString() + ")";
+    }
 }

[Jboss-svn-commits] JBL Code SVN: r4728 - labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service

[<jbo...@li...>]

Author: adamw
Date: 2006-06-11 05:53:16 -0400 (Sun, 11 Jun 2006)
New Revision: 4728

Modified:
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java
Log:
Debug info

Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java	2006-06-11 04:02:47 UTC (rev 4727)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/service/ShotokuServiceImpl.java	2006-06-11 09:53:16 UTC (rev 4728)
@@ -183,7 +183,8 @@
     }
 
     public String getServiceDescription() {
-        return "Cache service.";
+        return "Cache service; currently storing " + cache.size() + " items in the cache and " +
+                cacheItems.size() + " ShotokuCacheItem objects.";
     }
 
     /*

[Jboss-svn-commits] JBL Code SVN: r4727 - labs/jbosslabs/branches

[<jbo...@li...>]

Author: dam...@jb...
Date: 2006-06-11 00:02:47 -0400 (Sun, 11 Jun 2006)
New Revision: 4727

Added:
   labs/jbosslabs/branches/prod/
Log:
Labs 1.1 Promote.

Copied: labs/jbosslabs/branches/prod (from rev 4726, labs/jbosslabs/branches/qa)

[Jboss-svn-commits] JBL Code SVN: r4726 - labs/jbosslabs/branches

[<jbo...@li...>]

Author: dam...@jb...
Date: 2006-06-11 00:02:31 -0400 (Sun, 11 Jun 2006)
New Revision: 4726

Removed:
   labs/jbosslabs/branches/prod/
Log:
Removing prod only to copy it from QA.  Labs 1.1 Promote.

[Jboss-svn-commits] JBL Code SVN: r4725 - labs/jbossweb/trunk/src/share/resources/ROOT.war

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-06-10 23:44:00 -0400 (Sat, 10 Jun 2006)
New Revision: 4725

Modified:
   labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp
Log:
Mention we are division of RedHat

Modified: labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp
===================================================================
--- labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp	2006-06-11 03:37:39 UTC (rev 4724)
+++ labs/jbossweb/trunk/src/share/resources/ROOT.war/index.jsp	2006-06-11 03:44:00 UTC (rev 4725)
@@ -73,7 +73,7 @@
     </td>
 </tr>
 <tr>
-    <td colspan="2"><div align="center"><font color="#525D76" size="-1"><em>Copyright &copy; 2006, JBoss Inc.</em></font></div>
+    <td colspan="2"><div align="center"><font color="#525D76" size="-1"><em>Copyright &copy; 2006, JBoss, a division of <a href="http://www.redhat.com">Red Hat</a></em></font></div>
     </td>
 </tr>
 </table>

[Jboss-svn-commits] JBL Code SVN: r4724 - labs/jbossweb/trunk/xdocs/images

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-06-10 23:37:39 -0400 (Sat, 10 Jun 2006)
New Revision: 4724

Modified:
   labs/jbossweb/trunk/xdocs/images/jbosslogo.gif
Log:
Update JBoss logo.

Modified: labs/jbossweb/trunk/xdocs/images/jbosslogo.gif
===================================================================
(Binary files differ)