Menu
▾
▴
jboss-svn-commits — JBoss SVN commit notifications
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(233) |
Sep
(199) |
Oct
(206) |
Nov
(185) |
Dec
(270) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(232) |
Feb
(426) |
Mar
(623) |
Apr
(592) |
May
(506) |
Jun
(389) |
Jul
(160) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(5) |
| 2007 |
Jan
(1) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(4) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(9) |
Nov
(6) |
Dec
(6) |
| 2008 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(3) |
May
(3) |
Jun
(5) |
Jul
(10) |
Aug
(2) |
Sep
(12) |
Oct
(10) |
Nov
(54) |
Dec
(49) |
| 2009 |
Jan
(19) |
Feb
(13) |
Mar
(20) |
Apr
(24) |
May
(44) |
Jun
(29) |
Jul
(32) |
Aug
(10) |
Sep
(7) |
Oct
(10) |
Nov
(4) |
Dec
(17) |
| 2010 |
Jan
(14) |
Feb
(5) |
Mar
(23) |
Apr
(50) |
May
(31) |
Jun
(9) |
Jul
(5) |
Aug
(4) |
Sep
(7) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
| 2011 |
Jan
(12) |
Feb
(5) |
Mar
(5) |
Apr
(3) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jbo...@li...> - 2006-06-08 15:11:52
|
Author: unibrew Date: 2006-06-08 11:11:47 -0400 (Thu, 08 Jun 2006) New Revision: 4673 Added: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/JBLabs-ds.xml.sample Log: Labs' datasource Added: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/JBLabs-ds.xml.sample =================================================================== --- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/JBLabs-ds.xml.sample 2006-06-08 14:51:43 UTC (rev 4672) +++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/JBLabs-ds.xml.sample 2006-06-08 15:11:47 UTC (rev 4673) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + <local-tx-datasource> + <jndi-name>LabsDS</jndi-name> + <connection-url> + jdbc:mysql://localhost:3306/dotorgdata?useServerPrepStmts=false + </connection-url> + <driver-class>org.gjt.mm.mysql.Driver</driver-class> + <user-name>dotorgdata</user-name> + <password></password> + </local-tx-datasource> +</datasources> |
|
From: <jbo...@li...> - 2006-06-08 14:51:47
|
Author: jfr...@jb...
Date: 2006-06-08 10:51:43 -0400 (Thu, 08 Jun 2006)
New Revision: 4672
Modified:
labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Disable crypto stuff to prevent export problems.
Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-06-08 13:03:21 UTC (rev 4671)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-06-08 14:51:43 UTC (rev 4672)
@@ -211,6 +211,9 @@
BUILDJPEG=true
BUILDMSQL=true
;;
+ CRYPT)
+ ALLOWCRYPTO=true
+ ;;
*)
echo "$i: not (yet) supported"
esac
@@ -218,6 +221,16 @@
done
#
+# Prevent cryptop stuff
+if ${ALLOWCRYPTO}
+then
+ echo "Be carefull with exporting the package: it contains crypto stuff"
+else
+ BUILDOSSL=false
+ BUILDKRB5=false
+fi
+
+#
# depending on machine remove or add php extensions.
OS=`uname -s`
PR=`uname -p`
@@ -376,7 +389,12 @@
Build krb5-${KRB5VER} ${TOOLS}/KRB5 "--enable-shared --with-tcl=no" "" "src"
ADDCONF="$ADDCONF --with-kerberos=$TOOLS/KRB5"
else
- ADDCONF="$ADDCONF --with-kerberos"
+ if ${ALLOWCRYPTO}
+ then
+ ADDCONF="$ADDCONF --with-kerberos"
+ else
+ ADDCONF="$ADDCONF --without-kerberos"
+ fi
fi
#
@@ -477,7 +495,12 @@
)
ADDCONF="$ADDCONF --with-openssl=$TOOLS/SSL --with-openssl-dir=$TOOLS/SSL"
else
- ADDCONF="$ADDCONF --with-openssl"
+ if ${ALLOWCRYTP}
+ then
+ ADDCONF="$ADDCONF --with-openssl"
+ else
+ ADDCONF="$ADDCONF --without-openssl"
+ fi
fi
#
@@ -491,9 +514,14 @@
export CPPFLAGS
LDFLAGS=-L$TOOLS/SSL/lib
export LDFLAGS
- Build openldap-${LDAPVER} ${TOOLS}/LDAP "--disable-slapd --with-tls=openssl" "depend"
+ Build openldap-${LDAPVER} ${TOOLS}/LDAP "--with-threads --disable-slapd --with-tls=openssl" "depend"
else
- Build openldap-${LDAPVER} ${TOOLS}/LDAP "--disable-slapd --with-tls" ""
+ if ${ALLOWCRYPTO}
+ then
+ Build openldap-${LDAPVER} ${TOOLS}/LDAP "--with-threads --disable-slapd --with-tls" ""
+ else
+ Build openldap-${LDAPVER} ${TOOLS}/LDAP "--with-threads --disable-slapd --without-tls --with-kerberos=no" ""
+ fi
fi
ADDCONF="$ADDCONF --with-ldap=$TOOLS/LDAP"
else
|
|
From: <jbo...@li...> - 2006-06-08 13:03:26
|
Author: jfr...@jb...
Date: 2006-06-08 09:03:21 -0400 (Thu, 08 Jun 2006)
New Revision: 4671
Modified:
labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Add xpm.
Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-06-08 11:43:38 UTC (rev 4670)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-06-08 13:03:21 UTC (rev 4671)
@@ -274,61 +274,68 @@
"
fi
-case `uname -n` in
- *)
- ADDCONF="$ADDCONF \
- --with-t1lib=no \
- --with-xpm-dir=no \
- "
- case ${OS} in
- Linux)
- EXTTYPE=static
- BUILDICNV=false
- ADDFLAGS="-I $JAVA_HOME/include/linux"
- ;;
- SunOS)
- BUILDICNV=true
- BUILDFTT2=true
- pkginfo | grep SPROcc
- if [ $? -eq 0 ]
- then
- CC=cc
- export CC
- fi
- # SUNWfreetype2 /usr/sfw
- # --with-freetype-dir=/usr/sfw (SUNWfreetype2 is 2.1.2)
- # don't use SMCmysql too old: /usr/local/mysql
- EXTTYPE=shared
- ADDFLAGS="-I $JAVA_HOME/include/solaris"
- ;;
- esac
- case ${PR} in
- x86_64)
- #ADDCONF="$ADDCONF --with-pic"
- # with-libdir=lib64 causes problem with SSL (our openssl location).
- # but without it ldap libraries are not found.
- ADDCONF="$ADDCONF --with-libdir=lib64 --with-pic"
- ADDFLAGS="$ADDFLAGS -fPIC"
- if [ ${CC} = "cc" ]
- then
- COMPILER=solaris-x86-cc
- fi
- ;;
- sparc)
- if [ ${CC} = "cc" ]
- then
- # Why not solaris64-sparcv9-cc? (does someone still use 32?)
- COMPILER=solaris-sparcv9-cc
- fi
- ;;
- i?86)
- if [ ${CC} = "cc" ]
- then
- COMPILER=solaris-x86-cc
- fi
- ;;
- esac
+ADDCONF="$ADDCONF --with-t1lib=no"
+case ${OS} in
+ Linux)
+ EXTTYPE=static
+ BUILDICNV=false
+ ADDFLAGS="-I $JAVA_HOME/include/linux"
+ LGDCONF="$LGDCONF --with-xpm"
+ ;;
+ SunOS)
+ BUILDICNV=true
+ BUILDFTT2=true
+ pkginfo | grep SPROcc
+ if [ $? -eq 0 ]
+ then
+ CC=cc
+ export CC
+ fi
+ pkginfo | grep xpm
+ if [ $? -eq 0 ]
+ then
+ pkginfo | grep SUNWxwinc
+ if [ $? -eq 0 ]
+ then
+ LGDCONF="$LGDCONF --with-xpm=/usr/local"
+ else
+ echo "Please install SUNWxwinc... Otherwise no xpm support"
+ LGDCONF="$LGDCONF --without-xpm"
+ fi
+ fi
+ # SUNWfreetype2 /usr/sfw
+ # --with-freetype-dir=/usr/sfw (SUNWfreetype2 is 2.1.2)
+ # don't use SMCmysql too old: /usr/local/mysql
+ EXTTYPE=shared
+ ADDFLAGS="-I $JAVA_HOME/include/solaris"
+ ;;
esac
+case ${PR} in
+ x86_64)
+ #ADDCONF="$ADDCONF --with-pic"
+ # with-libdir=lib64 causes problem with SSL (our openssl location).
+ # but without it ldap libraries are not found.
+ ADDCONF="$ADDCONF --with-libdir=lib64 --with-pic"
+ ADDFLAGS="$ADDFLAGS -fPIC"
+ if [ ${CC} = "cc" ]
+ then
+ COMPILER=solaris-x86-cc
+ fi
+ ;;
+ sparc)
+ if [ ${CC} = "cc" ]
+ then
+ # Why not solaris64-sparcv9-cc? (does someone still use 32?)
+ COMPILER=solaris-sparcv9-cc
+ fi
+ ;;
+ i?86)
+ if [ ${CC} = "cc" ]
+ then
+ COMPILER=solaris-x86-cc
+ fi
+ ;;
+esac
#
# build iconv if required.
@@ -427,12 +434,10 @@
Build gd-${LBGDVER} ${TOOLS}/LBGD "--without-xpm $LGDCONF" ""
ADDCONF="$ADDCONF --with-gd=$TOOLS/LBGD \
--enable-gd-native-ttf \
- --without-xpm \
"
else
ADDCONF="$ADDCONF --with-gd \
--enable-gd-native-ttf \
- --without-xpm \
"
fi
|
|
From: <jbo...@li...> - 2006-06-08 11:43:47
|
Author: mic...@jb...
Date: 2006-06-08 07:43:38 -0400 (Thu, 08 Jun 2006)
New Revision: 4670
Modified:
labs/jbossrules/trunk/build.xml
Log:
added groups to javadoc generation (still need to add internal, and an overview.html and more package.html)
Modified: labs/jbossrules/trunk/build.xml
===================================================================
--- labs/jbossrules/trunk/build.xml 2006-06-08 09:42:29 UTC (rev 4669)
+++ labs/jbossrules/trunk/build.xml 2006-06-08 11:43:38 UTC (rev 4670)
@@ -483,7 +483,7 @@
packagenames="org.drools.*"
excludepackagenames="org.drools.asm.*"
destdir="target/docs/apidocs"
- author="false"
+ author="false"
version="false">
<sourcepath>
@@ -497,6 +497,22 @@
<include name="target/drools-*.jar" />
</fileset>
</classpath>
+
+ <group title="Runtime Core API"
+ packages="org.drools"/>
+ <group title="Compiler Core API"
+ packages="org.drools.compiler"/>
+
+
+ <group title="Compiler Utilities"
+ packages="org.drools.lang:org.drools.xml"/>
+
+ <group title="Runtime Utilities"
+ packages="org.drools.audit*:org.drools.event:org.drools.visualize"/>
+ <group title="Decision Tables"
+ packages="org.drools.decisiontable"/>
+
+
</javadoc>
</target>
@@ -541,6 +557,22 @@
<param name="-tag" value="y.uml"/>
<param name="-breakiterator"/>
</doclet>
+
+ <group title="Runtime Core API"
+ packages="org.drools"/>
+ <group title="Compiler Core API"
+ packages="org.drools.compiler"/>
+
+
+ <group title="Compiler Utilities"
+ packages="org.drools.lang:org.drools.xml"/>
+
+ <group title="Runtime Utilities"
+ packages="org.drools.audit*:org.drools.event:org.drools.visualize"/>
+ <group title="Decision Tables"
+ packages="org.drools.decisiontable"/>
+
+
</javadoc>
</target>
|
|
From: <jbo...@li...> - 2006-06-08 11:07:22
|
Author: kev...@jb...
Date: 2006-06-08 05:34:09 -0400 (Thu, 08 Jun 2006)
New Revision: 4668
Added:
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/HandlerAddressingContext.java
Modified:
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/AddressingContext.java
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/ActionHandler.java
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/AddressingInterceptorHandler.java
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/FaultToHandler.java
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/FromHandler.java
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/MessageIDHandler.java
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/ReplyToHandler.java
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/ToHandler.java
Log:
Factor out WSA error handling
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/AddressingContext.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/AddressingContext.java 2006-06-08 08:20:25 UTC (rev 4667)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/AddressingContext.java 2006-06-08 09:34:09 UTC (rev 4668)
@@ -34,7 +34,6 @@
import com.arjuna.webservices.SoapFault;
import com.arjuna.webservices.logging.WSCLogger;
import com.arjuna.webservices.stax.AnyContentSupport;
-import com.arjuna.webservices.stax.ElementContent;
import com.arjuna.webservices.stax.NamedElement;
import com.arjuna.webservices.util.StreamHelper;
@@ -47,7 +46,7 @@
/**
* The key used for the addressing context within a message exchange.
*/
- private static final byte[] ADDRESSING_CONTEXT_PROPERTY = new byte[0] ;
+ protected static final byte[] ADDRESSING_CONTEXT_PROPERTY = new byte[0] ;
/**
* The To header.
@@ -79,15 +78,6 @@
private List relatesTo ;
/**
- * The fault header name.
- */
- private QName faultHeaderName ;
- /**
- * The fault header.
- */
- private ElementContent faultHeader ;
-
- /**
* The associated request addressing context.
*/
private AddressingContext requestContext ;
@@ -95,7 +85,7 @@
/**
* Default constructor.
*/
- private AddressingContext()
+ protected AddressingContext()
{
}
@@ -243,42 +233,6 @@
}
/**
- * Get the fault header name.
- * @return The fault header name.
- */
- public QName getFaultHeaderName()
- {
- return faultHeaderName ;
- }
-
- /**
- * Set the fault header name.
- * @param faultHeaderName The fault header name.
- */
- public void setFaultHeaderName(final QName faultHeaderName)
- {
- this.faultHeaderName = faultHeaderName;
- }
-
- /**
- * Get the fault header.
- * @return The fault header.
- */
- public ElementContent getFaultHeader()
- {
- return faultHeader ;
- }
-
- /**
- * Set the fault header.
- * @param faultHeader The fault header.
- */
- public void setFaultHeader(final ElementContent faultHeader)
- {
- this.faultHeader = faultHeader;
- }
-
- /**
* Get the associated request context.
* @return The associated request context or null if no association exists.
*/
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/ActionHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/ActionHandler.java 2006-06-08 08:20:25 UTC (rev 4667)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/ActionHandler.java 2006-06-08 09:34:09 UTC (rev 4668)
@@ -26,7 +26,6 @@
import com.arjuna.webservices.MessageContext;
import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.wsaddr2005.AddressingContext;
import com.arjuna.webservices.wsaddr2005.AttributedURIType;
/**
@@ -47,15 +46,23 @@
{
final QName headerName = in.getName() ;
final AttributedURIType action = new AttributedURIType(in) ;
- final AddressingContext addressingContext = AddressingContext.getContext(context) ;
- if (addressingContext.getAction() != null)
+ final HandlerAddressingContext addressingContext = HandlerAddressingContext.getHandlerContext(context) ;
+ if (!addressingContext.isFaultedAction())
{
- addressingContext.setFaultHeaderName(headerName) ;
- addressingContext.setFaultHeader(action) ;
+ if (addressingContext.getAction() != null)
+ {
+ addressingContext.setFaultedAction() ;
+ addressingContext.setAction(null) ;
+ if (addressingContext.getFaultHeaderName() == null)
+ {
+ addressingContext.setFaultHeaderName(headerName) ;
+ addressingContext.setFaultHeader(action) ;
+ }
+ }
+ else
+ {
+ addressingContext.setAction(action) ;
+ }
}
- else
- {
- addressingContext.setAction(action) ;
- }
}
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/AddressingInterceptorHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/AddressingInterceptorHandler.java 2006-06-08 08:20:25 UTC (rev 4667)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/AddressingInterceptorHandler.java 2006-06-08 09:34:09 UTC (rev 4668)
@@ -276,7 +276,7 @@
final String action, final XMLStreamReader in)
throws SoapFault
{
- final AddressingContext addressingContext = AddressingContext.getContext(context) ;
+ final HandlerAddressingContext addressingContext = HandlerAddressingContext.getHandlerContext(context) ;
final QName faultHeaderName = addressingContext.getFaultHeaderName() ;
if (faultHeaderName != null)
{
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/FaultToHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/FaultToHandler.java 2006-06-08 08:20:25 UTC (rev 4667)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/FaultToHandler.java 2006-06-08 09:34:09 UTC (rev 4668)
@@ -26,7 +26,6 @@
import com.arjuna.webservices.MessageContext;
import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.wsaddr2005.AddressingContext;
import com.arjuna.webservices.wsaddr2005.EndpointReferenceType;
/**
@@ -47,15 +46,23 @@
{
final QName headerName = in.getName() ;
final EndpointReferenceType faultTo = new EndpointReferenceType(in) ;
- final AddressingContext addressingContext = AddressingContext.getContext(context) ;
- if (addressingContext.getFaultTo() != null)
+ final HandlerAddressingContext addressingContext = HandlerAddressingContext.getHandlerContext(context) ;
+ if (!addressingContext.isFaultedFaultTo())
{
- addressingContext.setFaultHeaderName(headerName) ;
- addressingContext.setFaultHeader(faultTo) ;
+ if (addressingContext.getFaultTo() != null)
+ {
+ addressingContext.setFaultedFaultTo() ;
+ addressingContext.setFaultTo(null) ;
+ if (addressingContext.getFaultHeaderName() == null)
+ {
+ addressingContext.setFaultHeaderName(headerName) ;
+ addressingContext.setFaultHeader(faultTo) ;
+ }
+ }
+ else
+ {
+ addressingContext.setFaultTo(faultTo) ;
+ }
}
- else
- {
- addressingContext.setFaultTo(faultTo) ;
- }
}
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/FromHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/FromHandler.java 2006-06-08 08:20:25 UTC (rev 4667)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/FromHandler.java 2006-06-08 09:34:09 UTC (rev 4668)
@@ -26,7 +26,6 @@
import com.arjuna.webservices.MessageContext;
import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.wsaddr2005.AddressingContext;
import com.arjuna.webservices.wsaddr2005.EndpointReferenceType;
/**
@@ -47,15 +46,23 @@
{
final QName headerName = in.getName() ;
final EndpointReferenceType from = new EndpointReferenceType(in) ;
- final AddressingContext addressingContext = AddressingContext.getContext(context) ;
- if (addressingContext.getFrom() != null)
+ final HandlerAddressingContext addressingContext = HandlerAddressingContext.getHandlerContext(context) ;
+ if (!addressingContext.isFaultedFrom())
{
- addressingContext.setFaultHeaderName(headerName) ;
- addressingContext.setFaultHeader(from) ;
+ if (addressingContext.getFrom() != null)
+ {
+ addressingContext.setFaultedFrom() ;
+ addressingContext.setFrom(null) ;
+ if (addressingContext.getFaultHeaderName() == null)
+ {
+ addressingContext.setFaultHeaderName(headerName) ;
+ addressingContext.setFaultHeader(from) ;
+ }
+ }
+ else
+ {
+ addressingContext.setFrom(from) ;
+ }
}
- else
- {
- addressingContext.setFrom(from) ;
- }
}
}
Added: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/HandlerAddressingContext.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/HandlerAddressingContext.java 2006-06-08 08:20:25 UTC (rev 4667)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/HandlerAddressingContext.java 2006-06-08 09:34:09 UTC (rev 4668)
@@ -0,0 +1,230 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.arjuna.webservices.wsaddr2005.handlers;
+
+import javax.xml.namespace.QName;
+
+import com.arjuna.webservices.MessageContext;
+import com.arjuna.webservices.stax.ElementContent;
+import com.arjuna.webservices.wsaddr2005.AddressingContext;
+
+/**
+ * Extension of the standard addressing context to include fault information.
+ * @author kevin
+ */
+class HandlerAddressingContext extends AddressingContext
+{
+ /**
+ * The fault header name.
+ */
+ private QName faultHeaderName ;
+ /**
+ * The fault header.
+ */
+ private ElementContent faultHeader ;
+
+ /**
+ * The faulted To flag.
+ */
+ private boolean faultedTo ;
+ /**
+ * The faulted Action flag.
+ */
+ private boolean faultedAction ;
+ /**
+ * The faulted MessageID flag.
+ */
+ private boolean faultedMessageID ;
+ /**
+ * The faulted From flag.
+ */
+ private boolean faultedFrom ;
+ /**
+ * The faulted ReplyTo flag.
+ */
+ private boolean faultedReplyTo ;
+ /**
+ * The faulted FaultTo flag.
+ */
+ private boolean faultedFaultTo ;
+
+ /**
+ * Default constructor.
+ */
+ private HandlerAddressingContext()
+ {
+ }
+
+ /**
+ * Get the fault header name.
+ * @return The fault header name.
+ */
+ QName getFaultHeaderName()
+ {
+ return faultHeaderName ;
+ }
+
+ /**
+ * Set the fault header name.
+ * @param faultHeaderName The fault header name.
+ */
+ void setFaultHeaderName(final QName faultHeaderName)
+ {
+ this.faultHeaderName = faultHeaderName;
+ }
+
+ /**
+ * Get the fault header.
+ * @return The fault header.
+ */
+ ElementContent getFaultHeader()
+ {
+ return faultHeader ;
+ }
+
+ /**
+ * Set the fault header.
+ * @param faultHeader The fault header.
+ */
+ void setFaultHeader(final ElementContent faultHeader)
+ {
+ this.faultHeader = faultHeader;
+ }
+
+ /**
+ * Has the To header been faulted?
+ * @return true if it has faulted, false otherwise.
+ */
+ boolean isFaultedTo()
+ {
+ return faultedTo ;
+ }
+
+ /**
+ * Set the faulted To flag.
+ */
+ void setFaultedTo()
+ {
+ faultedTo = true ;
+ }
+
+ /**
+ * Has the Action header been faulted?
+ * @return true if it has faulted, false otherwise.
+ */
+ boolean isFaultedAction()
+ {
+ return faultedAction ;
+ }
+
+ /**
+ * Set the faulted Action flag.
+ */
+ void setFaultedAction()
+ {
+ faultedAction = true ;
+ }
+
+ /**
+ * Has the MessageID header been faulted?
+ * @return true if it has faulted, false otherwise.
+ */
+ boolean isFaultedMessageID()
+ {
+ return faultedMessageID ;
+ }
+
+ /**
+ * Set the faulted MessageID flag.
+ */
+ void setFaultedMessageID()
+ {
+ faultedMessageID = true ;
+ }
+
+ /**
+ * Has the From header been faulted?
+ * @return true if it has faulted, false otherwise.
+ */
+ boolean isFaultedFrom()
+ {
+ return faultedFrom ;
+ }
+
+ /**
+ * Set the faulted From flag.
+ */
+ void setFaultedFrom()
+ {
+ faultedFrom = true ;
+ }
+
+ /**
+ * Has the ReplyTo header been faulted?
+ * @return true if it has faulted, false otherwise.
+ */
+ boolean isFaultedReplyTo()
+ {
+ return faultedReplyTo ;
+ }
+
+ /**
+ * Set the faulted ReplyTo flag.
+ */
+ void setFaultedReplyTo()
+ {
+ faultedReplyTo = true ;
+ }
+
+ /**
+ * Has the FaultTo header been faulted?
+ * @return true if it has faulted, false otherwise.
+ */
+ boolean isFaultedFaultTo()
+ {
+ return faultedFaultTo ;
+ }
+
+ /**
+ * Set the faulted FaultTo flag.
+ */
+ void setFaultedFaultTo()
+ {
+ faultedFaultTo = true ;
+ }
+
+ /**
+ * Get the addressing context from the message context if present.
+ * @param messageContext The message context.
+ * @return The addressing context or null if not present.
+ */
+ public static HandlerAddressingContext getHandlerContext(final MessageContext messageContext)
+ {
+ final HandlerAddressingContext addressingContext = (HandlerAddressingContext)messageContext.getProperty(ADDRESSING_CONTEXT_PROPERTY) ;
+ if (addressingContext != null)
+ {
+ return addressingContext ;
+ }
+ final HandlerAddressingContext newAddressingContext = new HandlerAddressingContext() ;
+ setContext(messageContext, newAddressingContext) ;
+ return newAddressingContext ;
+ }
+}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/MessageIDHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/MessageIDHandler.java 2006-06-08 08:20:25 UTC (rev 4667)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/MessageIDHandler.java 2006-06-08 09:34:09 UTC (rev 4668)
@@ -26,7 +26,6 @@
import com.arjuna.webservices.MessageContext;
import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.wsaddr2005.AddressingContext;
import com.arjuna.webservices.wsaddr2005.AttributedURIType;
/**
@@ -47,15 +46,22 @@
{
final QName headerName = in.getName() ;
final AttributedURIType messageID = new AttributedURIType(in) ;
- final AddressingContext addressingContext = AddressingContext.getContext(context) ;
- if (addressingContext.getMessageID() != null)
+ final HandlerAddressingContext addressingContext = HandlerAddressingContext.getHandlerContext(context) ;
+ if (!addressingContext.isFaultedMessageID())
{
- addressingContext.setFaultHeaderName(headerName) ;
- addressingContext.setFaultHeader(messageID) ;
+ if (addressingContext.getMessageID() != null)
+ {
+ addressingContext.setFaultedMessageID() ;
+ if (addressingContext.getFaultHeaderName() == null)
+ {
+ addressingContext.setFaultHeaderName(headerName) ;
+ addressingContext.setFaultHeader(messageID) ;
+ }
+ }
+ else
+ {
+ addressingContext.setMessageID(messageID) ;
+ }
}
- else
- {
- addressingContext.setMessageID(messageID) ;
- }
}
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/ReplyToHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/ReplyToHandler.java 2006-06-08 08:20:25 UTC (rev 4667)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/ReplyToHandler.java 2006-06-08 09:34:09 UTC (rev 4668)
@@ -26,7 +26,6 @@
import com.arjuna.webservices.MessageContext;
import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.wsaddr2005.AddressingContext;
import com.arjuna.webservices.wsaddr2005.EndpointReferenceType;
/**
@@ -47,15 +46,23 @@
{
final QName headerName = in.getName() ;
final EndpointReferenceType replyTo = new EndpointReferenceType(in) ;
- final AddressingContext addressingContext = AddressingContext.getContext(context) ;
- if (addressingContext.getReplyTo() != null)
+ final HandlerAddressingContext addressingContext = HandlerAddressingContext.getHandlerContext(context) ;
+ if (!addressingContext.isFaultedReplyTo())
{
- addressingContext.setFaultHeaderName(headerName) ;
- addressingContext.setFaultHeader(replyTo) ;
+ if (addressingContext.getReplyTo() != null)
+ {
+ addressingContext.setFaultedReplyTo() ;
+ addressingContext.setReplyTo(null) ;
+ if (addressingContext.getFaultHeaderName() == null)
+ {
+ addressingContext.setFaultHeaderName(headerName) ;
+ addressingContext.setFaultHeader(replyTo) ;
+ }
+ }
+ else
+ {
+ addressingContext.setReplyTo(replyTo) ;
+ }
}
- else
- {
- addressingContext.setReplyTo(replyTo) ;
- }
}
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/ToHandler.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/ToHandler.java 2006-06-08 08:20:25 UTC (rev 4667)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/wsaddr2005/handlers/ToHandler.java 2006-06-08 09:34:09 UTC (rev 4668)
@@ -26,7 +26,6 @@
import com.arjuna.webservices.MessageContext;
import com.arjuna.webservices.SoapFault;
-import com.arjuna.webservices.wsaddr2005.AddressingContext;
import com.arjuna.webservices.wsaddr2005.AttributedURIType;
/**
@@ -47,15 +46,23 @@
{
final QName headerName = in.getName() ;
final AttributedURIType to = new AttributedURIType(in) ;
- final AddressingContext addressingContext = AddressingContext.getContext(context) ;
- if (addressingContext.getTo() != null)
+ final HandlerAddressingContext addressingContext = HandlerAddressingContext.getHandlerContext(context) ;
+ if (!addressingContext.isFaultedTo())
{
- addressingContext.setFaultHeaderName(headerName) ;
- addressingContext.setFaultHeader(to) ;
+ if (addressingContext.getTo() != null)
+ {
+ addressingContext.setFaultedTo() ;
+ addressingContext.setTo(null) ;
+ if (addressingContext.getFaultHeaderName() == null)
+ {
+ addressingContext.setFaultHeaderName(headerName) ;
+ addressingContext.setFaultHeader(to) ;
+ }
+ }
+ else
+ {
+ addressingContext.setTo(to) ;
+ }
}
- else
- {
- addressingContext.setTo(to) ;
- }
}
}
|
|
From: <jbo...@li...> - 2006-06-08 11:04:19
|
Author: jfr...@jb...
Date: 2006-06-08 03:31:44 -0400 (Thu, 08 Jun 2006)
New Revision: 4665
Modified:
labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Remove lab machine specifc stuff.
Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-06-08 01:38:10 UTC (rev 4664)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-06-08 07:31:44 UTC (rev 4665)
@@ -275,60 +275,6 @@
fi
case `uname -n` in
- OLDdev12)
- BUILDXML2=true
- BUILDPSQL=true
- BUILDLPNG=true
- BUILDJPEG=true
- CC=cc
- export CC
- # -with-libxml-dir=/usr/local but 2.6.11 needed.
- # Solaris dynamic ld exports the symbols so build shared extensions.
- EXTTYPE=shared
- ADDCONF="\
- --with-libexpat-dir=/usr/local \
- --with-curl=no \
- --with-zlib-dir \
- --with-freetype-dir=/usr/sfw \
- --with-t1lib=no \
- --with-imap=no \
- --with-mysql=no \
- --with-mysqli=no \
- --with-pdo-mysql=no \
- --with-pspell=no \
- --with-readline=no \
- --with-tidy=no \
- --with-openssl \
- "
- # Make sure the right xml2 is used.
- # the make install of php (PEAR) uses php and need libxml2.
- LD_LIBRARY_PATH=$TOOLS/lib:$LD_LIBRARY_PATH
- export LD_LIBRARY_PATH
- ADDFLAGS="-I $JAVA_HOME/include/solaris"
- ;;
- OLDdev13*)
- EXTTYPE=shared
- BUILDXML2=true
- BUILDPSQL=true
- BUILDOSSL=true
- BUILDLPNG=true
- BUILDJPEG=true
- CC=cc
- export CC
- COMPILER=solaris-x86-cc
- ADDCONF="\
- --with-iconv-dir=/usr/local \
- --with-freetype-dir=/usr/sfw \
- --with-t1lib \
- \
- --with-xpm-dir=no \
- --with-t1lib=no \
- --with-curl=no \
- --with-imap=no \
- --with-pspell=no \
- "
- ADDFLAGS="-I $JAVA_HOME/include/solaris"
- ;;
*)
ADDCONF="$ADDCONF \
--with-t1lib=no \
|
|
From: <jbo...@li...> - 2006-06-08 10:39:42
|
Author: kev...@jb...
Date: 2006-06-08 05:42:29 -0400 (Thu, 08 Jun 2006)
New Revision: 4669
Added:
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/services/framework/admin/TaskManagerInitialisation.java
Modified:
labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c_web-app.xml
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/services/framework/task/TaskManager.java
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpClient.java
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpClientInitialisation.java
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpServiceMultiplexorServlet.java
labs/jbosstm/trunk/XTS/coordinator/dd/webMethods-web-app.xml
labs/jbosstm/trunk/XTS/demo/dd/webmethods/web-app.xml
Log:
Add task manager and packet logging configuration
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c_web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c_web-app.xml 2006-06-08 09:34:09 UTC (rev 4668)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/dd/ws-c_web-app.xml 2006-06-08 09:42:29 UTC (rev 4669)
@@ -26,6 +26,19 @@
<description>Arjuna Web Services and WS-Coordination</description>
+ <!-- Initialise the Task Manager -->
+ <context-param>
+ <param-name>TaskManager.minWorkerCount</param-name>
+ <param-value>0</param-value>
+ </context-param>
+ <context-param>
+ <param-name>TaskManager.maxWorkerCount</param-name>
+ <param-value>10</param-value>
+ </context-param>
+ <listener>
+ <listener-class>com.arjuna.services.framework.admin.TaskManagerInitialisation</listener-class>
+ </listener>
+
<!-- Initialise WS-C services -->
<listener>
<listener-class>com.arjuna.webservices.wscoor.server.ActivationCoordinatorInitialisation</listener-class>
@@ -67,6 +80,10 @@
<param-name>BaseHttpsURI</param-name>
<param-value>https://@hostname@:@port@/xts/soap/</param-value>
</init-param>
+ <init-param>
+ <param-name>LogPackets</param-name>
+ <param-value>true</param-value>
+ </init-param>
-->
<load-on-startup>1</load-on-startup>
</servlet>
Added: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/services/framework/admin/TaskManagerInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/services/framework/admin/TaskManagerInitialisation.java 2006-06-08 09:34:09 UTC (rev 4668)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/services/framework/admin/TaskManagerInitialisation.java 2006-06-08 09:42:29 UTC (rev 4669)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+package com.arjuna.services.framework.admin;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import com.arjuna.services.framework.task.TaskManager;
+import com.arjuna.webservices.logging.WSCLogger;
+
+/**
+ * Context listener used to initialise the Task Manager.
+ * @author kevin
+ */
+public class TaskManagerInitialisation implements ServletContextListener
+{
+ /**
+ * The context has been initialized.
+ * @param servletContextEvent The sevlet context event.
+ * @message com.arjuna.services.framework.admin.TaskManagerInitialisation_1 [com.arjuna.services.framework.admin.TaskManagerInitialisation_1] -
+ * Invalid minimum worker count.
+ * @message com.arjuna.services.framework.admin.TaskManagerInitialisation_2 [com.arjuna.services.framework.admin.TaskManagerInitialisation_2] -
+ * Invalid maximum worker count.
+ */
+ public void contextInitialized(final ServletContextEvent servletContextEvent)
+ {
+ final ServletContext servletContext = servletContextEvent.getServletContext() ;
+ final String minWorkerCountParam = servletContext.getInitParameter("TaskManager.minWorkerCount") ;
+ final String maxWorkerCountParam = servletContext.getInitParameter("TaskManager.maxWorkerCount") ;
+
+ final TaskManager taskManager = TaskManager.getManager() ;
+ if (minWorkerCountParam != null)
+ {
+ try
+ {
+ final int minWorkerCount = Integer.parseInt(minWorkerCountParam) ;
+ taskManager.setMinimumWorkerCount(minWorkerCount) ;
+ }
+ catch (final NumberFormatException nfe)
+ {
+ WSCLogger.arjLoggerI18N.debug("com.arjuna.services.framework.admin.TaskManagerInitialisation_1") ;
+ }
+ }
+ if (maxWorkerCountParam != null)
+ {
+ try
+ {
+ final int maxWorkerCount = Integer.parseInt(maxWorkerCountParam) ;
+ taskManager.setMaximumWorkerCount(maxWorkerCount) ;
+ }
+ catch (final NumberFormatException nfe)
+ {
+ WSCLogger.arjLoggerI18N.debug("com.arjuna.services.framework.admin.TaskManagerInitialisation_2") ;
+ }
+ }
+ }
+
+ /**
+ * The context is about to be destroyed.
+ * @param servletContextEvent The servlet context event.
+ */
+ public void contextDestroyed(final ServletContextEvent servletContextEvent)
+ {
+ TaskManager.getManager().shutdown() ;
+ }
+}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/services/framework/task/TaskManager.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/services/framework/task/TaskManager.java 2006-06-08 09:34:09 UTC (rev 4668)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/services/framework/task/TaskManager.java 2006-06-08 09:42:29 UTC (rev 4669)
@@ -118,7 +118,7 @@
*/
public boolean queueTask(final Task task)
{
- final boolean debugEnabled = WSCLogger.arjLoggerI18N.debugAllowed() ;
+ final boolean debugEnabled = WSCLogger.arjLoggerI18N.isDebugEnabled() ;
synchronized(workerPool)
{
if (shutdown)
@@ -182,7 +182,7 @@
*/
public void setMinimumWorkerCount(final int minimumWorkerCount)
{
- final boolean debugEnabled = WSCLogger.arjLoggerI18N.debugAllowed() ;
+ final boolean debugEnabled = WSCLogger.arjLoggerI18N.isDebugEnabled() ;
synchronized(workerPool)
{
if (shutdown)
@@ -251,7 +251,7 @@
*/
public void setMaximumWorkerCount(final int maximumWorkerCount)
{
- final boolean debugEnabled = WSCLogger.arjLoggerI18N.debugAllowed() ;
+ final boolean debugEnabled = WSCLogger.arjLoggerI18N.isDebugEnabled() ;
synchronized(workerPool)
{
if (shutdown)
@@ -325,7 +325,7 @@
*/
public void shutdown()
{
- final boolean debugEnabled = WSCLogger.arjLoggerI18N.debugAllowed() ;
+ final boolean debugEnabled = WSCLogger.arjLoggerI18N.isDebugEnabled() ;
synchronized(workerPool)
{
@@ -403,7 +403,7 @@
*/
Task getTask()
{
- final boolean debugEnabled = WSCLogger.arjLoggerI18N.debugAllowed() ;
+ final boolean debugEnabled = WSCLogger.arjLoggerI18N.isDebugEnabled() ;
while(true)
{
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpClient.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpClient.java 2006-06-08 09:34:09 UTC (rev 4668)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpClient.java 2006-06-08 09:42:29 UTC (rev 4669)
@@ -22,6 +22,7 @@
import java.io.BufferedInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintWriter;
@@ -116,11 +117,17 @@
throw new SoapFault(SoapFaultType.FAULT_SENDER, WSCLogger.log_mesg.getString("com.arjuna.webservices.transport.http.HttpClient_2")) ;
}
- final String requestContents = serialiseRequest(request) ;
- if (SoapMessageLogging.isThreadLogEnabled())
+ final boolean threadLogEnabled = SoapMessageLogging.isThreadLogEnabled() ;
+ final String requestContents ;
+ if (threadLogEnabled)
{
+ requestContents = serialiseRequest(request) ;
SoapMessageLogging.appendThreadLog(requestContents) ;
}
+ else
+ {
+ requestContents = null ;
+ }
final HttpURLConnection httpURLConnection ;
try
@@ -132,105 +139,122 @@
throw new SoapFault(SoapFaultType.FAULT_SENDER, WSCLogger.log_mesg.getString("com.arjuna.webservices.transport.http.HttpClient_3")) ;
}
- try
+ httpURLConnection.setDoOutput(true) ;
+ httpURLConnection.setUseCaches(false) ;
+
+ final int numHeaders = HTTP_HEADERS.length ;
+ for(int count = 0 ; count < numHeaders ; count++)
{
- httpURLConnection.setDoOutput(true) ;
- httpURLConnection.setUseCaches(false) ;
-
- final int numHeaders = HTTP_HEADERS.length ;
- for(int count = 0 ; count < numHeaders ; count++)
- {
- final String[] header = HTTP_HEADERS[count] ;
- httpURLConnection.setRequestProperty(header[0], header[1]) ;
- }
-
- final SoapDetails soapDetails = request.getSoapDetails() ;
- final String contentType = HttpUtils.getContentType(soapDetails) ;
- httpURLConnection.setRequestProperty(HttpUtils.HTTP_CONTENT_TYPE_HEADER, contentType + HttpUtils.HTTP_DEFAULT_CHARSET_PARAMETER) ;
- httpURLConnection.setRequestProperty(HttpUtils.HTTP_ACCEPT_HEADER, contentType) ;
-
- final String requestAction = request.getAction() ;
- final String actionValue = (requestAction == null ? "" : requestAction) ;
-
- // KEV - fix action handling for different SOAP versions
- httpURLConnection.setRequestProperty(HttpUtils.SOAP_ACTION_HEADER, '"' + actionValue + '"') ;
-
+ final String[] header = HTTP_HEADERS[count] ;
+ httpURLConnection.setRequestProperty(header[0], header[1]) ;
+ }
+
+ final SoapDetails soapDetails = request.getSoapDetails() ;
+ final String contentType = HttpUtils.getContentType(soapDetails) ;
+ httpURLConnection.setRequestProperty(HttpUtils.HTTP_CONTENT_TYPE_HEADER, contentType + HttpUtils.HTTP_DEFAULT_CHARSET_PARAMETER) ;
+ httpURLConnection.setRequestProperty(HttpUtils.HTTP_ACCEPT_HEADER, contentType) ;
+
+ final String requestAction = request.getAction() ;
+ final String actionValue = (requestAction == null ? "" : requestAction) ;
+
+ // KEV - fix action handling for different SOAP versions
+ httpURLConnection.setRequestProperty(HttpUtils.SOAP_ACTION_HEADER, '"' + actionValue + '"') ;
+
+ if (requestContents != null)
+ {
httpURLConnection.setRequestProperty(HttpUtils.HTTP_CONTENT_LENGTH_HEADER,
Integer.toString(requestContents.length())) ;
-
- final int port = serviceURL.getPort() ;
- final String host = (port > 0 ? serviceURL.getHost() + ":" + port : serviceURL.getHost()) ;
- httpURLConnection.setRequestProperty(HttpUtils.HTTP_HOST_HEADER, host) ;
- httpURLConnection.setRequestProperty(HttpUtils.HTTP_CONNECTION_HEADER, "close") ;
- httpURLConnection.setRequestMethod("POST") ;
-
- httpURLConnection.connect() ;
- final OutputStream os = httpURLConnection.getOutputStream() ;
+ }
+
+ final int port = serviceURL.getPort() ;
+ final String host = (port > 0 ? serviceURL.getHost() + ":" + port : serviceURL.getHost()) ;
+ httpURLConnection.setRequestProperty(HttpUtils.HTTP_HOST_HEADER, host) ;
+ httpURLConnection.setRequestMethod("POST") ;
+
+ httpURLConnection.connect() ;
+ final OutputStream os = httpURLConnection.getOutputStream() ;
+ try
+ {
final PrintWriter writer = new PrintWriter(os) ;
- writer.print(requestContents) ;
- writer.flush() ;
-
- final int responseCode = httpURLConnection.getResponseCode() ;
-
- if ((responseCode != HttpURLConnection.HTTP_OK) &&
- (responseCode != HttpURLConnection.HTTP_ACCEPTED) &&
- (responseCode != HttpURLConnection.HTTP_INTERNAL_ERROR))
+ if (requestContents != null)
{
- final String pattern = WSCLogger.log_mesg.getString("com.arjuna.webservices.transport.http.HttpClient_4") ;
- final String message = MessageFormat.format(pattern, new Object[] {new Integer(responseCode)}) ;
- throw new SoapFault(SoapFaultType.FAULT_SENDER, message) ;
+ writer.print(requestContents) ;
}
-
- final String fullResponseContentType = httpURLConnection.getContentType() ;
-// final String responseContentType = HttpUtils.getContentType(fullResponseContentType) ;
- // Ignore responses that aren't the same version of SOAP
-// if ((contentType != null) && !contentType.equals(responseContentType))
+ else
+ {
+ request.output(writer) ;
+ }
+ writer.flush() ;
+ }
+ finally
+ {
+ os.close() ;
+ }
+
+ final int responseCode = httpURLConnection.getResponseCode() ;
+
+ if ((responseCode != HttpURLConnection.HTTP_OK) &&
+ (responseCode != HttpURLConnection.HTTP_ACCEPTED) &&
+ (responseCode != HttpURLConnection.HTTP_INTERNAL_ERROR))
+ {
+ final String pattern = WSCLogger.log_mesg.getString("com.arjuna.webservices.transport.http.HttpClient_4") ;
+ final String message = MessageFormat.format(pattern, new Object[] {new Integer(responseCode)}) ;
+ throw new SoapFault(SoapFaultType.FAULT_SENDER, message) ;
+ }
+
+ final String fullResponseContentType = httpURLConnection.getContentType() ;
+// final String responseContentType = HttpUtils.getContentType(fullResponseContentType) ;
+ // Ignore responses that aren't the same version of SOAP
+// if ((contentType != null) && !contentType.equals(responseContentType))
+// {
+// if (threadLogEnabled)
// {
-// if (SoapMessageLogging.isThreadLogEnabled())
-// {
-// SoapMessageLogging.appendThreadLog(null) ;
-// }
-// return null ;
+// SoapMessageLogging.appendThreadLog(null) ;
// }
-
- final int contentLength = httpURLConnection.getContentLength() ;
- if (contentLength == 0)
+// return null ;
+// }
+
+ final int contentLength = httpURLConnection.getContentLength() ;
+ if (contentLength == 0)
+ {
+ if (threadLogEnabled)
{
- if (SoapMessageLogging.isThreadLogEnabled())
- {
- SoapMessageLogging.appendThreadLog(null) ;
- }
- return null ;
+ SoapMessageLogging.appendThreadLog(null) ;
}
-
- final SoapService soapService = request.getSoapService() ;
- final String encoding = HttpUtils.getContentTypeEncoding(fullResponseContentType) ;
- final BufferedInputStream bis ;
- if (responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR)
- {
- bis = new BufferedInputStream(httpURLConnection.getErrorStream()) ;
- }
- else
- {
- bis = new BufferedInputStream(httpURLConnection.getInputStream()) ;
- }
+ return null ;
+ }
+
+ final SoapService soapService = request.getSoapService() ;
+ final String encoding = HttpUtils.getContentTypeEncoding(fullResponseContentType) ;
+ final InputStream is ;
+ if (responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR)
+ {
+ is = httpURLConnection.getErrorStream() ;
+ }
+ else
+ {
+ is = httpURLConnection.getInputStream() ;
+ }
+ try
+ {
+ final BufferedInputStream bis = new BufferedInputStream(is) ;
final InputStreamReader isr = (encoding == null ? new InputStreamReader(bis) : new InputStreamReader(bis, encoding)) ;
final Reader reader ;
- if ((contentLength <= 0) || SoapMessageLogging.isThreadLogEnabled())
+ if (threadLogEnabled || (contentLength <= 0))
{
final String responseContents = readStream(isr) ;
if (responseContents.length() == 0)
{
- if (SoapMessageLogging.isThreadLogEnabled())
+ if (threadLogEnabled)
{
SoapMessageLogging.appendThreadLog(null) ;
}
return null ;
}
- if (SoapMessageLogging.isThreadLogEnabled())
+ if (threadLogEnabled)
{
SoapMessageLogging.appendThreadLog(responseContents) ;
}
@@ -256,7 +280,7 @@
}
finally
{
- httpURLConnection.disconnect() ;
+ is.close() ;
}
}
@@ -283,30 +307,7 @@
break ;
}
}
- checkForXMLDecl(stringBuffer) ;
return stringBuffer.toString() ;
}
-
- private static void checkForXMLDecl(final StringBuffer buffer)
- {
- int count = 0 ;
- try
- {
- while(Character.isWhitespace(buffer.charAt(count))) count++ ;
- if (buffer.charAt(count) == '<')
- {
- if (buffer.charAt(count+1) == '?')
- {
- count+=2 ;
- while(buffer.charAt(count++) != '>') ;
- }
- }
- if (count > 0)
- {
- buffer.delete(0, count) ;
- }
- }
- catch (final StringIndexOutOfBoundsException sioobe) {}
- }
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpClientInitialisation.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpClientInitialisation.java 2006-06-08 09:34:09 UTC (rev 4668)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpClientInitialisation.java 2006-06-08 09:42:29 UTC (rev 4669)
@@ -50,5 +50,8 @@
*/
public void contextDestroyed(final ServletContextEvent servletContextEvent)
{
+ final SoapRegistry soapRegistry = SoapRegistry.getRegistry() ;
+ soapRegistry.removeSoapClient(HttpUtils.HTTPS_SCHEME) ;
+ soapRegistry.removeSoapClient(HttpUtils.HTTP_SCHEME) ;
}
}
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpServiceMultiplexorServlet.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpServiceMultiplexorServlet.java 2006-06-08 09:34:09 UTC (rev 4668)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/transport/http/HttpServiceMultiplexorServlet.java 2006-06-08 09:42:29 UTC (rev 4669)
@@ -90,7 +90,7 @@
/**
* Flag to log packets.
*/
- private boolean logPackets = true ;
+ private boolean logPackets ;
/**
* Initialise the servlet.
@@ -101,7 +101,6 @@
throws ServletException
{
config(servletConfig) ;
- // KEV configure the packet logging.
}
/**
@@ -141,17 +140,17 @@
final MessageContext messageContext = new MessageContext() ;
initialiseContext(messageContext, request) ;
final MessageContext messageResponseContext = new MessageContext() ;
+ final Reader input = request.getReader() ;
final Reader reader ;
- // KEV create a reader to remove the XML declaration.
if (logPackets)
{
- final String contents = readAll(request.getReader()) ;
+ final String contents = readAll(input) ;
SoapMessageLogging.appendThreadLog(contents) ;
reader = new StringReader(contents) ;
}
else
{
- reader = request.getReader() ;
+ reader = input ;
}
final SoapMessage soapResponse ;
try
@@ -388,6 +387,12 @@
baseHttpURI = processURI(servletConfig.getInitParameter("BaseHttpURI")) ;
baseHttpsURI = processURI(servletConfig.getInitParameter("BaseHttpsURI")) ;
+
+ final String logPacketValue = servletConfig.getInitParameter("LogPackets") ;
+ if (logPacketValue != null)
+ {
+ logPackets = Boolean.valueOf(logPacketValue).booleanValue() ;
+ }
}
/**
@@ -470,29 +475,6 @@
break ;
}
}
- checkForXMLDecl(contents) ;
return contents.toString() ;
}
-
- private static void checkForXMLDecl(final StringBuffer buffer)
- {
- int count = 0 ;
- try
- {
- while(Character.isWhitespace(buffer.charAt(count))) count++ ;
- if (buffer.charAt(count) == '<')
- {
- if (buffer.charAt(count+1) == '?')
- {
- count+=2 ;
- while(buffer.charAt(count++) != '>') ;
- }
- }
- if (count > 0)
- {
- buffer.delete(0, count) ;
- }
- }
- catch (final StringIndexOutOfBoundsException sioobe) {}
- }
}
Modified: labs/jbosstm/trunk/XTS/coordinator/dd/webMethods-web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/coordinator/dd/webMethods-web-app.xml 2006-06-08 09:34:09 UTC (rev 4668)
+++ labs/jbosstm/trunk/XTS/coordinator/dd/webMethods-web-app.xml 2006-06-08 09:42:29 UTC (rev 4669)
@@ -63,7 +63,20 @@
<display-name>XML Transaction Coordinator</display-name>
<description>XML Transaction Coordinator</description>
-
+
+ <!-- Initialise the Task Manager -->
+ <context-param>
+ <param-name>TaskManager.minWorkerCount</param-name>
+ <param-value>0</param-value>
+ </context-param>
+ <context-param>
+ <param-name>TaskManager.maxWorkerCount</param-name>
+ <param-value>10</param-value>
+ </context-param>
+ <listener>
+ <listener-class>com.arjuna.services.framework.admin.TaskManagerInitialisation</listener-class>
+ </listener>
+
<!-- Initialise WS-C services -->
<listener>
<listener-class>com.arjuna.webservices.wscoor.server.ActivationCoordinatorInitialisation</listener-class>
@@ -154,8 +167,12 @@
<!--
<init-param>
<param-name>BaseHttpsURI</param-name>
- <param-value>https://@hostname@:@port@/arjuna/soap/</param-value>
+ <param-value>https://@hostname@:@port@/@urlstub@/soap/</param-value>
</init-param>
+ <init-param>
+ <param-name>LogPackets</param-name>
+ <param-value>true</param-value>
+ </init-param>
-->
<load-on-startup>1</load-on-startup>
</servlet>
Modified: labs/jbosstm/trunk/XTS/demo/dd/webmethods/web-app.xml
===================================================================
--- labs/jbosstm/trunk/XTS/demo/dd/webmethods/web-app.xml 2006-06-08 09:34:09 UTC (rev 4668)
+++ labs/jbosstm/trunk/XTS/demo/dd/webmethods/web-app.xml 2006-06-08 09:42:29 UTC (rev 4669)
@@ -64,6 +64,19 @@
<description>XML Transaction Service Demo Client</description>
+ <!-- Initialise the Task Manager -->
+ <context-param>
+ <param-name>TaskManager.minWorkerCount</param-name>
+ <param-value>0</param-value>
+ </context-param>
+ <context-param>
+ <param-name>TaskManager.maxWorkerCount</param-name>
+ <param-value>10</param-value>
+ </context-param>
+ <listener>
+ <listener-class>com.arjuna.services.framework.admin.TaskManagerInitialisation</listener-class>
+ </listener>
+
<!-- Initialise WS-C services -->
<listener>
<listener-class>com.arjuna.webservices.wscoor.server.ActivationCoordinatorInitialisation</listener-class>
@@ -209,8 +222,12 @@
<!--
<init-param>
<param-name>BaseHttpsURI</param-name>
- <param-value>https://@hostname@:@port@/arjuna/soap/</param-value>
+ <param-value>https://@hostname@:@port@/@urlstub@/soap/</param-value>
</init-param>
+ <init-param>
+ <param-name>LogPackets</param-name>
+ <param-value>true</param-value>
+ </init-param>
-->
<load-on-startup>1</load-on-startup>
</servlet>
|
|
From: <jbo...@li...> - 2006-06-08 10:30:58
|
Author: mic...@jb...
Date: 2006-06-08 04:20:25 -0400 (Thu, 08 Jun 2006)
New Revision: 4667
Added:
labs/jbossrules/trunk/documentation/training/developers-course/lab-1-introduction/
labs/jbossrules/trunk/documentation/training/developers-course/lab-1-introduction/Instructions.txt
Log:
Added: labs/jbossrules/trunk/documentation/training/developers-course/lab-1-introduction/Instructions.txt
===================================================================
--- labs/jbossrules/trunk/documentation/training/developers-course/lab-1-introduction/Instructions.txt 2006-06-08 08:19:38 UTC (rev 4666)
+++ labs/jbossrules/trunk/documentation/training/developers-course/lab-1-introduction/Instructions.txt 2006-06-08 08:20:25 UTC (rev 4667)
@@ -0,0 +1,30 @@
+---------------------------------------------
+JBoss Rules Essentials Lab Excercise 1
+ - Introduction -
+---------------------------------------------
+
+Instructions:
+ This excercise ensures that the plug in and environment/path are all setup,
+ and the student can fire off some simple code to fire some rules in the rule IDE/Workbench.
+
+ Step 1: Install Eclipse 3.2 if it is already on the machine. (and check that it starts up ! let the workspace be in the default location).
+ Step 2: Install the JBoss Rules plug in
+ This can be done 2 ways (at your discretion)
+ 1. From the update site (if connected to the web or update site or a local update site exists)
+ ONLY use this if you are familiar with Eclipse and how update sites work.
+ 2. Open the plug in zip file (jbossrules-ide-3.XXX-bin.zip) where XXX is the appropriate version.
+ You will find file in /plugins directory inside the zip called org.drools.ide_XXX.jar (where XXX is appropriate version).
+ Stick that jar file in the /plugins directory where your eclipse is installed. Restart Eclipse.
+ (if you were to open that jar file, you will see all the deps and jars inside it).
+ Step 3: Fire up eclipse, you should notice the new rules icon.
+ Step 4: From the rule icons menu, choose "New Rules Project", and then enter the name "LabProject" as the project name, press "Finish"
+ Step 6: Examine the structure of the rule project, both src/rules and src/java should be setup on the classpath already.
+ Step 7: Open the Sample.drl file in the src/rules folder, not the Drools icon, and the syntax highlighting etc.
+ Step 8: Also note that the package of the drl does not have to be the same as the folder structure the rules are stored in.
+ Step 9: Open the DroolsTest class file that is generated. Note that it has an inner static class that is used as a fact in the rule.
+ Step 10: Run the DroolsTest class as a java application: Run menu|Run As|Java Application
+ Step 11: You should see results in the console output tab down the bottom. ("Hello Cruel world..." etc).
+ Step 13: (optional) - can convert to a unit test with JUnit if you want (JUnit is already on the classpath).
+ Step 14: Try out the rule creation wizard, press ctrl+N, then choose JBoss Rules, then choose New Rule Resource. Create a new empty rule to your liking.
+ Step 15: party. Note that for rules to be built automatically, need to be in .drl files. You can also use .rule files, but they will
+ not be built in the background automatically (sometimes you want that). Any other format, and it will just be a text editor.
\ No newline at end of file
|
|
From: <jbo...@li...> - 2006-06-08 09:14:03
|
Author: mic...@jb... Date: 2006-06-08 04:19:38 -0400 (Thu, 08 Jun 2006) New Revision: 4666 Modified: labs/jbossrules/trunk/documentation/training/developers-course/Module 2 - JBoss Rules Intro.odp labs/jbossrules/trunk/documentation/training/developers-course/course_outline.odt Log: Modified: labs/jbossrules/trunk/documentation/training/developers-course/Module 2 - JBoss Rules Intro.odp =================================================================== (Binary files differ) Modified: labs/jbossrules/trunk/documentation/training/developers-course/course_outline.odt =================================================================== (Binary files differ) |
Author: dam...@jb... Date: 2006-06-07 20:43:10 -0400 (Wed, 07 Jun 2006) New Revision: 4662 Added: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagmeSet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java Removed: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/maven.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/public/TagMe.html Log: MERGED: -r 4329:4380 https://svn.labs.jboss.com/labs/jbosslabs/trunk . for Labs 1.1 testing. Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -160,11 +160,11 @@ //timer.scheduleTimer(DEFAULT_TIMER_INTERVAL); // Enabling administration for this service. - Tools.getService().addAdministratedService(new AdministratedServiceGetter() { + /*Tools.getService().addAdministratedService(new AdministratedServiceGetter() { public AdministratedService getService() { return ForgeHelper.getForgeManagement(); } - }); + });*/ log.info("Forge service created, with timer interval: " + getTimerInterval()); } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -22,6 +22,7 @@ package org.jboss.forge.status; +import java.sql.Timestamp; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -71,6 +72,8 @@ /** Projects present in the Status Matrix */ private Projects projects; + private Timestamp timestamp; + private Logger log; /** @@ -92,13 +95,13 @@ PluginsValues pluginsValues; try { - // Get current scores + // Get latest available scores + ScoresManager.init(portalName, serviceConf); + pluginsValues = ScoresManager.getLatestScores(); - ScoresManager.init(portalName, serviceConf); + // Compute and save current scores ScoresManager.save(projects, pluginsConf); - - pluginsValues = ScoresManager.getCurrentScores(); - + timestamp = ScoresManager.requestCurrentScores(); } catch (ScoresSaveException e) { log.error("Saving scores failed ", e); return; @@ -203,4 +206,17 @@ return colMap; } + public boolean needsUpdate() { + + PluginsValues pluginsValues = ScoresManager.getScores(timestamp); + + if (pluginsValues == null) { + return false; + } + + //TODO refresh scores + + return true; + } + } \ No newline at end of file Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -29,8 +29,11 @@ import org.jboss.shotoku.cache.ChangeType; import org.jboss.shotoku.cache.ShotokuResourceWatcher; -public class StatusConfWatcher extends ShotokuResourceWatcher<String, StatusDescriptor> { +public class StatusConfWatcher extends + ShotokuResourceWatcher<String, StatusDescriptor> { + public StatusConfWatcher(long interval) {} + private StatusDescriptor getDesc(String portalName) { return new StatusDescriptor(portalName, getContentManager(portalName)); } @@ -49,7 +52,8 @@ /* Watch all project.xml files. * We assume that they contain entries used by plugins */ - Set<String> projectXmlPathsSet = Locations.getProjectXmlPathsSet(portalName); + Set<String> projectXmlPathsSet = + Locations.getProjectXmlPathsSet(portalName); for (String projectXmlPath : projectXmlPathsSet) { addWatchedPath(key, projectXmlPath); @@ -59,7 +63,14 @@ } @Override - protected void update(String key, StatusDescriptor currentObject, Map<String, ChangeType> changes) { + /* Called only when some of the watched resources changes. */ + public void update(String key, StatusDescriptor currentObject, + Map<String, ChangeType> changes) { put(key, getDesc(key)); } + + @Override + public void update(String key, StatusDescriptor desc) { + desc.update(); + } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -83,6 +83,8 @@ } public DelegateContext getContext() { + + update(); return context; } @@ -102,5 +104,12 @@ Node root = parser.getDocument().getDocumentElement(); return root; } + + public void update() { + + if (status.needsUpdate()) { + fillContext(); + } + } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -29,7 +29,7 @@ import org.jboss.forge.common.ForgeHelper; import org.jboss.forge.status.common.Locations; -import org.jboss.forge.status.common.Tools; +import org.jboss.forge.status.tools.Tools; import org.jboss.portal.common.context.DelegateContext; import org.jboss.portal.core.servlet.jsp.PortalJsp; Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -1,21 +0,0 @@ -package org.jboss.forge.status.common; - -import org.jboss.forge.status.StatusDescriptor; -import org.jboss.forge.status.StatusConfWatcher; - -import org.jboss.shotoku.aop.CacheItem; - -/** - * Common functions. - * @author Pawel Wrzeszcz - */ -public class Tools { - - @CacheItem - private static StatusConfWatcher conf; - - public static synchronized StatusDescriptor getDesc(final String portalName) { - return conf.get(portalName); - } - -} Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -23,7 +23,6 @@ package org.jboss.forge.status.plugins; import java.util.Calendar; -import java.util.Date; import java.util.Properties; import org.jboss.forge.common.projects.Projects; @@ -74,13 +73,11 @@ long prevValue; Calendar cal = Calendar.getInstance(); - Date now = cal.getTime(); cal.add(Calendar.DAY_OF_MONTH,-7); - Date prev = cal.getTime(); try { prevValue = ScoresManagerSync.getValue( - insidePlugin.getId(), projectId, prev,now); + insidePlugin.getId(), projectId, cal); } catch (GetScoresException e) { return 0; } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -22,7 +22,7 @@ package org.jboss.forge.status.service; -import java.util.Date; +import java.util.Calendar; import java.util.List; import org.jboss.forge.common.projects.Projects; @@ -39,8 +39,8 @@ public void save(Projects projects, List<PluginConf> pluginsConf, String portalName) throws ScoresSaveException; - public PluginsValues getPluginsValues(String portalName, Date date) + public PluginsValues getPluginsValues(String portalName, Calendar cal) throws GetScoresException; - public boolean hasPluginsValues(String portalName, Date date); + public boolean hasPluginsValues(String portalName, Calendar cal); } \ No newline at end of file Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -23,7 +23,7 @@ package org.jboss.forge.status.service.impl; import java.sql.Timestamp; -import java.util.Date; +import java.util.Calendar; import java.util.List; import javax.ejb.ActivationConfigProperty; @@ -109,13 +109,12 @@ private static void handleRequest(GetScoresRequest getScoresRequest) { - Date date = getScoresRequest.getDate(); - Date toDate = getScoresRequest.getToDate(); + Calendar cal = getScoresRequest.getCalendar(); Timestamp timestamp = getScoresRequest.getTimestamp(); PluginsValues pluginsValues = null; try { - pluginsValues = ScoresManagerSync.getScores(date, toDate); + pluginsValues = ScoresManagerSync.getScores(cal); } catch (GetScoresException e) { log.error(e); //TODO return; //?? Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -37,7 +37,6 @@ import javax.ejb.Remote; import org.jboss.annotation.ejb.LocalBinding; -import org.jboss.annotation.ejb.Management; import org.jboss.annotation.ejb.RemoteBinding; import org.jboss.annotation.ejb.Service; @@ -68,7 +67,6 @@ */ @Service(objectName=Tags.STATUS_SERVICE_NAME) -@Management(ScoresService.class) @Local(ScoresServiceLocal.class) @LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE) @Remote(ScoresServiceRemote.class) @@ -161,18 +159,17 @@ * @return scores from the given date * @throws GetScoresException */ - public PluginsValuesImpl getPluginsValues(String portalName, Date date) + public PluginsValuesImpl getPluginsValues(String portalName, Calendar cal) throws GetScoresException { log.info("Returning plugins values..."); // null date means today - if (date == null) { - Calendar cal = Calendar.getInstance(); - date = cal.getTime(); + if (cal == null) { + cal = Calendar.getInstance(); } - String key = getNodeName(date); + String key = getNodeName(cal); PluginsValuesImpl v = values.get(key); if (v == null) { // Not in cache => get value and store it @@ -190,7 +187,7 @@ } if (dir != null) { - v = getPluginsValues(dir, date); + v = getPluginsValues(dir, cal); log.info("Finished."); values.put(key,v); } @@ -206,12 +203,12 @@ * @return * @throws GetScoresException */ - private PluginsValuesImpl getPluginsValues(Directory dir, Date date) + private PluginsValuesImpl getPluginsValues(Directory dir, Calendar cal) throws GetScoresException { // Get appropriate node Node node = null; - String nodeName = getNodeName(date); + String nodeName = getNodeName(cal); try { node = dir.getNode(nodeName); @@ -319,15 +316,16 @@ /** * Gets name of Node containing saved data from specified datestamp. - * Notice that only year, month and day matter in passed <code>date</code>. + * Notice that only year, month and day matter in passed <code>cal</code>. * - * @param date datestamp * @return Node name */ - private String getNodeName(Date date) { + private String getNodeName(Calendar cal) { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Date date = cal.getTime(); + return df.format(date); } @@ -336,18 +334,17 @@ */ private String getCurrentNodeName() { - Calendar cal = Calendar.getInstance(); - Date today = cal.getTime(); + Calendar today = Calendar.getInstance(); return getNodeName(today); } - public boolean hasPluginsValues(String portalName, Date date) { + public boolean hasPluginsValues(String portalName, Calendar cal) { PluginsValuesImpl pluginsValues = null; try { - pluginsValues = getPluginsValues(portalName, date); + pluginsValues = getPluginsValues(portalName, cal); } catch (GetScoresException e) { return false; } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -23,8 +23,7 @@ package org.jboss.forge.status.service.impl.protocol; import java.sql.Timestamp; -import java.util.Date; - +import java.util.Calendar; import org.jboss.forge.status.service.protocol.GetScoresRequest; /** @@ -34,26 +33,20 @@ private static final long serialVersionUID = 7844595317056960170L; - private Date date; - private Date toDate; + private Calendar cal; private Timestamp timestamp; - public GetScoresRequestImpl(Date date, Date toDate, + public GetScoresRequestImpl(Calendar cal, Timestamp timestamp) { - this.date = date; - this.toDate = toDate; + this.cal = cal; this.timestamp = timestamp; } - public Date getDate() { - return date; + public Calendar getCalendar() { + return cal; } - public Date getToDate() { - return toDate; - } - public Timestamp getTimestamp() { return timestamp; } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -24,16 +24,14 @@ import java.io.Serializable; import java.sql.Timestamp; -import java.util.Date; +import java.util.Calendar; /** * @author Pawel Wrzeszcz */ public interface GetScoresRequest extends Serializable { - public Date getDate(); - - public Date getToDate(); + public Calendar getCalendar(); public Timestamp getTimestamp(); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -86,14 +86,6 @@ orderPluginId = XmlTools.getChildNodeValue(pageRoot, Tags.ORDER_PLUGIN_ELEMENT); } - - /** - * @param projects Projects present in the Status Matrix - */ - public Columns(Projects projects) { - this.projects = projects; - columns = new ArrayList<Column>(); - } /** * Adds to the columns list columns defined in columnsRoot. Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -24,7 +24,7 @@ import java.io.Serializable; import java.sql.Timestamp; -import java.util.Date; +import java.util.Calendar; import java.util.List; import java.util.Properties; @@ -62,7 +62,7 @@ public static void init(String portalName, ServiceConf serviceConf) { - ScoresManagerSync.init(portalName, serviceConf); //TODO inheritance + ScoresManagerSync.init(portalName, serviceConf); isRemote = serviceConf.isRemote(); System.out.println("remote: " + isRemote); @@ -85,23 +85,22 @@ } } - public static PluginsValues getScores(Date date, Date toDate) + public static Timestamp requestScores(Calendar cal) throws GetScoresException { - //TODO toDate Timestamp timestamp = new Timestamp(System.currentTimeMillis()); GetScoresRequest getScoresRequest = - new GetScoresRequestImpl(date, toDate, timestamp); - - // Send message + new GetScoresRequestImpl(cal, timestamp); + try { sendMessage(Constants.GET_SCORES_MESSAGE, getScoresRequest); } catch (Exception e) { throw new GetScoresException(e); } - PluginsValues pluginsValues = null; + return timestamp; + /* int attempts = 0; for (;;) { @@ -121,38 +120,47 @@ throw new GetScoresException(e); } } + */ + } + + public static Timestamp requestCurrentScores() + throws GetScoresException { - return pluginsValues; + Calendar cal = Calendar.getInstance(); + + return requestScores(cal); } - /** - * For the specified plugin returns historical project score - * from the given <code>date</code> in the past. - * If scores from specified day are not available, - * the next available scores saved at the day before or equal - * to <code>toDate</code> are returned. - * - * Notice that only year, month and day matter in passed dates. - * - * @return project score from the given date for specified plugin - * @throws GetScoresException - */ - public static long getValue(String pluginId, String projectId, - Date date, Date toDate) - throws GetScoresException { + public static PluginsValues getScores(Timestamp timestamp) { + - PluginsValues pluginsValues = getScores(date, toDate); - - return pluginsValues.getPluginValue(pluginId, projectId); + PluginsValues pluginsValues = RecordManager.get(timestamp); + + System.out.println("attempt"); + + return pluginsValues; } - - public static PluginsValues getCurrentScores() + + public static PluginsValues getLatestScores() throws GetScoresException { - Date now = new Date(); + Calendar cal = Calendar.getInstance(); + int attempts = 0; - return getScores(now, now); + for(;;) { + + if (ScoresManagerSync.hasScores(cal)) { + return ScoresManagerSync.getScores(cal); + } + + if ((attempts++) == Constants.MAX_ATTEMPTS) { + return null; + } + + cal.add(Calendar.DAY_OF_MONTH, -1); + } } + private static void sendMessage(String name, Serializable request) throws NamingException, JMSException { @@ -179,5 +187,4 @@ sender.send(message); session.close (); } - } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -22,7 +22,7 @@ package org.jboss.forge.status.tools; -import java.util.Date; +import java.util.Calendar; import java.util.List; import java.util.Properties; @@ -76,14 +76,14 @@ service.save(projects, pluginsConf, portalName); } - public static PluginsValues getScores(Date date, Date toDate) + public static PluginsValues getScores(Calendar cal) throws GetScoresException { PluginsValues pluginsValues = null; try { ScoresService service = getService(); - pluginsValues = service.getPluginsValues(portalName, date); + pluginsValues = service.getPluginsValues(portalName, cal); } catch (Exception e) { throw new GetScoresException(e); } @@ -95,12 +95,21 @@ return pluginsValues; } + public static boolean hasScores(Calendar cal) { + + ScoresService service; + try { + service = getService(); + } catch (NamingException e) { + return false; + } + + return service.hasPluginsValues(portalName, cal); + } + /** * For the specified plugin returns historical project score * from the given <code>date</code> in the past. - * If scores from specified day are not available, - * the next available scores saved at the day before or equal - * to <code>toDate</code> are returned. * * Notice that only year, month and day matter in passed dates. * @@ -108,10 +117,10 @@ * @throws GetScoresException */ public static long getValue(String pluginId, String projectId, - Date date, Date toDate) + Calendar cal) throws GetScoresException { - PluginsValues pluginsValues = getScores(date, toDate); + PluginsValues pluginsValues = getScores(cal); return pluginsValues.getPluginValue(pluginId, projectId); } @@ -119,9 +128,9 @@ public static PluginsValues getCurrentScores() throws GetScoresException { - Date now = new Date(); + Calendar now = Calendar.getInstance(); - return getScores(now, now); + return getScores(now); } private static ScoresService getService() throws NamingException { Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java (from rev 4380, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/maven.xml =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/maven.xml 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/maven.xml 2006-06-08 00:43:10 UTC (rev 4662) @@ -28,8 +28,8 @@ </goal> <goal name="deploy"> - <!--<ant:copy file="target/tagme-servlet.war" toDir="${local.deploy.dir}" />--> - <ant:copy file="target/tagme-servlet.war" toDir="/home/tomek/jboss/park_rozrywki/server/default/deploy" /> + <ant:copy file="target/tagme-servlet.war" toDir="${local.deploy.dir}" /> + <!--<ant:copy file="target/tagme-servlet.war" toDir="/home/tomek/jboss/park_rozrywki/server/default/deploy" />--> </goal> <goal name="clean"> Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -25,6 +25,7 @@ import java.util.Vector; import org.jboss.labs.tagme.gwt.client.TaggingService; +import org.jboss.labs.tagme.services.TagMeTagger; import org.jboss.logging.Logger; import com.google.gwt.user.server.rpc.RemoteServiceServlet; @@ -37,20 +38,49 @@ */ private static final long serialVersionUID = 1L; - public Vector getTags(String path) { - Vector vect = new Vector(); + public Vector getTags(String path, String clas) { + Vector vect = null; - vect.add("piwo"); vect.add("wodka"); vect.add("kefir"); + /*vect.add("piwo"); vect.add("wodka"); vect.add("kefir"); vect.add("słoń"); vect.add("kulfon"); vect.add("kret"); - vect.add("polska"); vect.add("europa"); vect.add("świat"); + vect.add("polska"); vect.add("europa"); vect.add("świat");*/ - Collections.sort(vect); + try { + TagMeTagger tagger = (TagMeTagger)Class.forName(clas).newInstance(); + + vect = tagger.getTags(path); + + Collections.sort(vect); + } catch (InstantiationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IllegalAccessException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ClassNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } return vect; } - public void addTag(String user, String path, String tag) { - + public void addTag(String user, String path, String clas, String tag) { + try { + TagMeTagger tagger = (TagMeTagger)Class.forName(clas).newInstance(); + + tagger.addTag(user, path, tag); + log.info("Tag added: User: "+user+" Path: "+path+" Tag: "+tag); + } catch (InstantiationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IllegalAccessException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ClassNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -39,6 +39,18 @@ public class TagMe implements EntryPoint { + private static final String TAG_PREFFIX = "tagMeSet"; + + private static final String DIV_PREFFIX = "tagMeDiv"; + + private static final String PATH_PREFIX = "tagMePath"; + + private static final String USER_PREFIX = "tagMeUser"; + + private static final String CLASS_PREFIX = "tagMeClass"; + + private Vector sets = new Vector(); + /** * Native method in JScript to access gwt:properties (couldn't find anything * in the mans for it) You add this on the page with <meta @@ -49,9 +61,22 @@ * @return value of property */ public static native String getProperty(String name) /*-{ - return parent.__gwt_getMetaProperty(name); + return parent.__gwt_getMetaProperty(name); }-*/; + public static native String getPropertiesUnsplited() /*-{ + var __gwt_all = ''; + + for (var tag in parent.__gwt_metaProps) { + __gwt_all += tag + ';'; + } + return __gwt_all; + }-*/; + + public String[] getPropertyNames() { + return getPropertiesUnsplited().split(";"); + } + /* * (non-Javadoc) * @@ -59,86 +84,43 @@ */ public void onModuleLoad() { // this is executed on the script start + String[] propNames = getPropertyNames(); - RootPanel.get().add(new Button("ClickMe", new ClickListener() { + // find correct props describing where tagme buttons should be placed + for (int i = 0; i < propNames.length; i++) { + //Window.alert(propNames[i]); + if (propNames[i] != null && propNames[i].startsWith(TAG_PREFFIX)) { + //Window.alert("found: "+propNames[i]); + String suff = getProperty(propNames[i]); - public void onClick(Widget sender) { + String div = getProperty(DIV_PREFFIX + suff); + String path = getProperty(PATH_PREFIX + suff); + String user = getProperty(USER_PREFIX + suff); + String clas = getProperty(CLASS_PREFIX + suff); - Window.alert("props: " + getProperty("tomek") + " oraz " - + getProperty("adam")); - VerticalPanel panel = new VerticalPanel(); - - final FlexTable table = new FlexTable(); - - panel.add(table); - - final Vector textBoxes = new Vector(); - - for (int i = 0; i < 3; i++) { - TextBox box = new TextBox(); - textBoxes.add(box); - panel.add(box); + //Window.alert("Added: "+propNames[i]+" div: "+div+" path: "+path+" user: "+user); + if (div != null && path != null && user != null && clas != null) { + TagmeSet set = new TagmeSet(div, path, user, clas); + sets.add(set); } + else { + Window.alert("Wrong set: "+suff+" div= "+div+" path= "+path+" user= "+user+" class= "+clas); + } + } + } - TaggingServiceAsync tagging = (TaggingServiceAsync) GWT - .create(TaggingService.class); + for (int i = 0; i < sets.size(); i++) { + TagmeSet set = (TagmeSet) sets.get(i); + String path = set.getPath(); + String user = set.getUser(); + String clas = set.getClas(); + RootPanel.get(set.getDiv()).add(getButton(path, user, clas)); + } + } - ServiceDefTarget endpoint = (ServiceDefTarget) tagging; - endpoint.setServiceEntryPoint("/tagme-servlet/tag/"); + private Button getButton(String path, String user, String clas) { - AsyncCallback callback = new AsyncCallback() { - public void onSuccess(Object result) { - Vector vect = (Vector) result; - - int cols = (int) Math.sqrt(vect.size()); - - for (int i = 0; i < vect.size(); i++) { - table.setText(i / cols, i % cols, (String) vect - .get(i)); - } - } - - public void onFailure(Throwable caught) { - Window.alert("Error ! " + caught.getMessage()); - } - }; - - // call AJAX methos, after that callback is going to be executed - tagging.getTags("path", callback); - - panel.add(new Button("Save", new ClickListener() { - - public void onClick(Widget sender) { - TaggingServiceAsync tagging = (TaggingServiceAsync) GWT - .create(TaggingService.class); - - ServiceDefTarget endpoint = (ServiceDefTarget) tagging; - endpoint.setServiceEntryPoint("/tagme-servlet/tag/"); - - AsyncCallback callback = new AsyncCallback() { - public void onSuccess(Object result) { - Window.alert(result.toString()); - } - - public void onFailure(Throwable caught) { - Window.alert("Error ! " + caught.getMessage()); - } - }; - - tagging.getTags(((TextBox) textBoxes.get(0)).getText(), - callback); - } - - })); - - PopupPanel popUp = new PopupPanel(true); - - popUp.add(panel); - - popUp.show(); - } - - })); + return new Button("ClickMe", new TagMeShowPopupListener(path, user, clas)); } } Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java (from rev 4380, labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java) Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java (from rev 4380, labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -39,14 +39,7 @@ * Path to get tags * @return collection of tags */ - public Vector getTags(String path); + public Vector getTags(String path, String clas); - /** - * Adds tag (not implemented yet) - * - * @param user - * @param path - * @param tag - */ - public void addTag(String user, String path, String tag); + public void addTag(String user, String path, String clas, String tag); } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -31,8 +31,8 @@ * */ public interface TaggingServiceAsync { - public void getTags(String path, AsyncCallback callback); + public void getTags(String path, String clas, AsyncCallback callback); - public void addTag(String user, String path, String tag, + public void addTag(String user, String path, String clas, String tag, AsyncCallback callback); } Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagmeSet.java (from rev 4380, labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagmeSet.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/public/TagMe.html =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/public/TagMe.html 2006-06-08 00:40:38 UTC (rev 4661) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/public/TagMe.html 2006-06-08 00:43:10 UTC (rev 4662) @@ -1,19 +1,38 @@ <html> - <head> + <head> + <meta name='gwt:property' content='tagMeSetTomek=tomek'> + <meta name='gwt:property' content='tagMeDivtomek=tomek'> + <meta name='gwt:property' content='tagMePathtomek=/tagme/tomek'> + <meta name='gwt:property' content='tagMeUsertomek=kulfon'> + <meta name='gwt:property' content='tagMeClasstomek=org.jboss.labs.tagme.services.ShotokuTaggingService'> + + <meta name='gwt:property' content='tagMeSetAdam=adam'> + <meta name='gwt:property' content='tagMeDivadam=adam'> + <meta name='gwt:property' content='tagMePathadam=/tagme/adam'> + <meta name='gwt:property' content='tagMeUseradam=monika'> + <meta name='gwt:property' content='tagMeClassadam=org.jboss.labs.tagme.services.ShotokuTaggingService'> + + <meta name='gwt:property' content='tomek=ziomek'> + <meta name='gwt:module' content='org.jboss.labs.tagme.gwt.TagMe'> - <meta name='gwt:property' content='tomek=ziomek'> + <title>Hello</title> </head> <body bgcolor="white"> - <meta name='gwt:property' content='adam=siadam'> - <script language="javascript" src="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/gwt.js"></script> + <script language="javascript" src="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/gwt.js"></script> Pod tym <br /> - <div id="TopMenu"> + <div id="tomek"> </div> <br /> ale nad tym + + + <div id="adam"> + + </div> + </body> </html> Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services (from rev 4380, labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-05-23 15:46:10 UTC (rev 4380) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.labs.tagme.services; - -import java.util.Iterator; -import java.util.Map; -import java.util.Vector; - -import org.jboss.logging.Logger; -import org.jboss.shotoku.ContentManager; -import org.jboss.shotoku.Node; -import org.jboss.shotoku.exceptions.RepositoryException; -import org.jboss.shotoku.exceptions.ResourceDoesNotExist; -import org.jboss.shotoku.exceptions.SaveException; - -public class ShotokuTaggingService implements TagMeTagger { - - private static final String SHOTOKU_TAG = "tag"; - - private static final Logger log = Logger.getLogger(ShotokuTaggingService.class); - - public Vector getTags(String path) { - log.info("Getting tags for: "+path); - ContentManager manager = ContentManager.getContentManager(); - - Vector<String> tags = new Vector<String>(); - - Node node; - try { - node = manager.getNode(path); - - Map<String, String> map = node.getProperties(); - - for (String key : map.keySet()) { - log.info(key); - if (key.startsWith(SHOTOKU_TAG)) { - tags.add(map.get(key)); - } - } - } catch (RepositoryException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ResourceDoesNotExist e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - return tags; - } - - public void addTag(String user, String path, String tag) { - log.info("Adding tag: "+tag+" for node: "+path); - ContentManager manager = ContentManager.getContentManager(); - - Node node; - - try { - node = manager.getNode(path); - - if (!getTags(path).contains(tag)) { - int i = 0; - while (node.getProperty(SHOTOKU_TAG + ":" + user + ":" + i) != null) { - i++; - } - - node.setProperty(SHOTOKU_TAG + ":" + user + ":" + i, tag); - - try { - node.save("Saving tag: "+tag+" by: "+user); - } catch (SaveException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - } catch (RepositoryException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ResourceDoesNotExist e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } - -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java (from rev 4380, labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-05-23 15:46:10 UTC (rev 4380) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-06-08 00:43:10 UTC (rev 4662) @@ -1,31 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.labs.tagme.services; - -import java.util.Vector; - -public interface TagMeTagger { - public Vector getTags(String path); - - - public void addTag(String user, String path, String tag); -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java (from rev 4380, labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java) |
Author: dam...@jb... Date: 2006-06-07 20:40:38 -0400 (Wed, 07 Jun 2006) New Revision: 4661 Added: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/maven.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/project.properties labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/project.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/TagMe.gwt.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/public/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/public/TagMe.html labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/server/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/servlet/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/jsp/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/jsp/normal.jsp labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/tld/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/web.xml Removed: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/maven.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/project.properties labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/project.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/TagMe.gwt.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/public/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/public/TagMe.html labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/server/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/servlet/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/jsp/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/jsp/normal.jsp labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/tld/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/web.xml Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/TitleChangeFilter.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/jbossForgeLayout.war/WEB-INF/layout/portal-strategies.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFStrategyImpl.java Log: MERGED: -r 4289:4329 https://svn.labs.jboss.com/labs/jbosslabs/trunk . for Labs 1.1 testing. Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google (from rev 4329, labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google) Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars (from rev 4329, labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar =================================================================== (Binary files differ) Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar (from rev 4329, labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar =================================================================== (Binary files differ) Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar (from rev 4329, labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar) Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -60,6 +60,12 @@ private Node menuNode; private Menu menu; + + private Node repositoryNode; + private Repository repository; + + private Node issueTrackerNode; + private IssueTracker issueTracker; /** * Reads information about a project from an xml file. @@ -125,6 +131,14 @@ if (menuNode != null) { menu = new Menu(portalName, menuNode, this); } + + if (repositoryNode != null) { + repository = new Repository(repositoryNode); + } + + if (issueTrackerNode != null) { + issueTracker = new IssueTracker(issueTrackerNode); + } } /** @@ -188,6 +202,12 @@ if (Menu.MENU_ELEMENT.equals(node.getNodeName())) { setMenuNode(node); } + if (Repository.REPOSITORY_ELEMENT.equals(node.getNodeName())) { + setRepositoryNode(node); + } + if (IssueTracker.ISSUE_TRACKER_ELEMENT.equals(node.getNodeName())) { + setIssueTrackerNode(node); + } } public void collect(PropertiesMap properties, Object data, @@ -202,7 +222,7 @@ private void setMenuNode(Node n) { menuNode = n; } - + /** * Gets a menu for this project. * @return An object representing this project's menu. @@ -211,6 +231,8 @@ return menu; } + + /* private PropertiesHandler getFreezonePropertiesHandler() { PropertiesHandlerStack ph = new PropertiesHandlerStack(); @@ -375,4 +397,28 @@ public boolean editPermissionAllowed(PermissionsChecker pc) { return thisProject.editPermissionAllowed(pc); } + + private void setRepositoryNode(Node node) { + repositoryNode = node; + } + + private void setIssueTrackerNode(Node node) { + issueTrackerNode = node; + } + + /** + * Gets a repository for this project. + * @return An object representing this project's repository. + */ + public Repository getProjectRepository() { + return repository; + } + + /** + * Gets an issue tracker for this project. + * @return An object representing this project's issue tracker. + */ + public IssueTracker getProjectIssueTracker() { + return issueTracker; + } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -258,4 +258,18 @@ public String getLevelLink(String levelId) { return getProjectsDescriptor().getLevelLink(levelId); } + + /** + * For the given project id, returns project repository. + */ + public Repository getProjectRepository(String projectId) { + return getProjectsDescriptor().getProjectRepository(projectId); + } + + /** + * For the given project id, returns project issue tracker. + */ + public IssueTracker getProjectIssueTracker(String projectId) { + return getProjectsDescriptor().getProjectIssueTracker(projectId); + } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -687,4 +687,48 @@ return link; } + + /** + * For the given project id, returns project repository. + * + * @param projectId + * Id of the project. + * @return project repository or null if no such project exists. + */ + public Repository getProjectRepository(String projectId) { + + if (!projectAdmissable(projectId)) { + return null; + } + + ProjectDescriptor pd = projects.get(projectId); + + if (pd == null) { + return null; + } + + return pd.getProjectRepository(); + } + + /** + * For the given project id, returns project issue tracker. + * + * @param projectId + * Id of the project. + * @return project issue tracker or null if no such project exists. + */ + public IssueTracker getProjectIssueTracker(String projectId) { + + if (!projectAdmissable(projectId)) { + return null; + } + + ProjectDescriptor pd = projects.get(projectId); + + if (pd == null) { + return null; + } + + return pd.getProjectIssueTracker(); + } } Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/TitleChangeFilter.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/TitleChangeFilter.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/TitleChangeFilter.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -68,7 +68,7 @@ (HttpServletResponse) response); chain.doFilter(request, wrapper); - if (wrapper.getContentType().startsWith("text/html")) { + if (wrapper.getContentType() != null && wrapper.getContentType().startsWith("text/html")) { PrintWriter out = response.getWriter(); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -35,6 +35,7 @@ import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; @@ -47,8 +48,7 @@ import org.jboss.forge.status.templates.Columns; import org.jboss.forge.status.templates.MatrixTemplate; import org.jboss.forge.status.tools.ScoresManagerSync; -import org.jboss.forge.status.tools.ScoresManagerAsync; -import org.jboss.forge.status.tools.Tags; +import org.jboss.forge.status.tools.ScoresManager; import org.jboss.logging.Logger; import org.jboss.portal.common.context.DelegateContext; @@ -92,12 +92,12 @@ PluginsValues pluginsValues; try { - // Compute and save current scores + // Get current scores - ScoresManagerAsync.init(portalName, serviceConf); - ScoresManagerAsync.save(projects, pluginsConf); + ScoresManager.init(portalName, serviceConf); + ScoresManager.save(projects, pluginsConf); - pluginsValues = ScoresManagerAsync.getCurrentScores(); + pluginsValues = ScoresManager.getCurrentScores(); } catch (ScoresSaveException e) { log.error("Saving scores failed ", e); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; -import org.jboss.forge.status.tools.Tools; +import org.jboss.forge.status.common.Locations; import org.jboss.shotoku.cache.ChangeType; import org.jboss.shotoku.cache.ShotokuResourceWatcher; @@ -40,16 +40,16 @@ String portalName = key; - addWatchedPath(key, Tools.getXmlCmPath(portalName)); - addWatchedPath(key, Tools.getXmlStatusPluginsCmPath(portalName)); - addWatchedPath(key, Tools.getServicePropertiesCmPath(portalName)); + addWatchedPath(key, Locations.getXmlCmPath(portalName)); + addWatchedPath(key, Locations.getXmlStatusPluginsCmPath(portalName)); + addWatchedPath(key, Locations.getServicePropertiesCmPath(portalName)); /* Watch projects.xml file */ - addWatchedPath(key, Tools.getProjectsXmlPath(portalName)); + addWatchedPath(key, Locations.getProjectsXmlPath(portalName)); /* Watch all project.xml files. * We assume that they contain entries used by plugins */ - Set<String> projectXmlPathsSet = Tools.getProjectXmlPathsSet(portalName); + Set<String> projectXmlPathsSet = Locations.getProjectXmlPathsSet(portalName); for (String projectXmlPath : projectXmlPathsSet) { addWatchedPath(key, projectXmlPath); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -25,7 +25,7 @@ import java.util.Map; import java.io.IOException; -import org.jboss.forge.status.tools.Tools; +import org.jboss.forge.status.common.Locations; import org.jboss.portal.common.context.DelegateContext; import org.jboss.shotoku.ContentManager; @@ -53,13 +53,13 @@ public StatusDescriptor(String portalName, ContentManager cm) { try { - String statusPath = Tools.getXmlCmPath(portalName); + String statusPath = Locations.getXmlCmPath(portalName); Node statusRoot = getRoot(cm , statusPath); - String pluginsPath = Tools.getXmlStatusPluginsCmPath(portalName); + String pluginsPath = Locations.getXmlStatusPluginsCmPath(portalName); Node pluginsRoot = getRoot(cm, pluginsPath); - String servicePath = Tools.getServicePropertiesCmPath(portalName); + String servicePath = Locations.getServicePropertiesCmPath(portalName); org.jboss.shotoku.Node serviceNode = cm.getNode(servicePath); status = new Status(portalName, statusRoot, pluginsRoot, Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -28,7 +28,9 @@ import javax.portlet.PortletRequestDispatcher; import org.jboss.forge.common.ForgeHelper; -import org.jboss.forge.status.tools.Tools; +import org.jboss.forge.status.common.Locations; +import org.jboss.forge.status.common.Tools; + import org.jboss.portal.common.context.DelegateContext; import org.jboss.portal.core.servlet.jsp.PortalJsp; @@ -62,17 +64,17 @@ DelegateContext context = null; if ((id != null) && (action.equals(PROJECT_DETAILS_ACTION))) { - jspPath = Tools.getPrjDetailsJspCmPath(); + jspPath = Locations.getPrjDetailsJspCmPath(); context = desc.getProjectContext(id); } if ((id != null) && (action.equals(COLUMN_DETAILS_ACTION))) { - jspPath = Tools.getColumnDetailsJspCmPath(); + jspPath = Locations.getColumnDetailsJspCmPath(); context = desc.getColumnContext(id); } if (id == null) { // Request for main Matrix page - jspPath = Tools.getJspCmPath(); + jspPath = Locations.getJspCmPath(); context = desc.getContext(); } Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-05-19 19:18:58 UTC (rev 4329) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -1,28 +0,0 @@ -package org.jboss.forge.status.common; - -/** - * @author Pawel Wrzeszcz - */ -public class Constants { - - - /* The length of time to sleep (in milliseconds) - * if requested scores are not available */ - public static final long SLEEP_TIME = 2000; - public static final int MAX_ATTEMPTS = 10; - - public static final String QUEUE_NAME = "queue/jmm"; - - public static final String NAME_PROPERTY = "name"; - public static final String SAVE_MESSAGE = "save"; - public static final String GET_SCORES_MESSAGE = "get"; - - public static final String STATUS_LOCAL_SERVICE = "Status/LocalScoresService"; - public static final String STATUS_REMOTE_SERVICE = "Status/RemoteScoresService"; - - /** - * This class cannot be instatiated. - */ - private Constants() {}; - -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java 2006-05-19 19:18:58 UTC (rev 4329) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -1,106 +0,0 @@ -package org.jboss.forge.status.common; - -import java.util.HashSet; -import java.util.Set; - -import org.jboss.forge.common.ForgeHelper; -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.PermissionsChecker; - -/** - * Common functions. - * @author Pawel Wrzeszcz - */ -public class Locations { - - /** <code>STATUS_XML<code> - file defining the list of watched feeds */ - private final static String STATUS_XML = "status.xml"; - private final static String STATUS_PLUGINS_XML = "plugins.xml"; - private final static String STATUS_SERVICE_PROPERTIES = "service.properties"; - - /** <code>STATUS_DIR</code> - directory in which file <code>STATUS_XML<code> is stored. */ - private final static String STATUS_DIR = "status"; - - private final static String STATUS_JSP = "status.jsp"; - private final static String STATUS_JSP_DIR = "status"; - private final static String PROJECT_DETAILS_JSP = "project_details.jsp"; - private final static String COLUMN_DETAILS_JSP = "column_details.jsp"; - - /** Shotoku directory to store historical scores */ - private static final String SHOTOKU_STATUS_DIR = "status"; - - /** - * Path to the xml file with the Status Matrix properties. - */ - public static String getXmlCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_XML; - } - - /** - * Path to the xml file defining Plugins used in the Matrix. - */ - public static String getXmlStatusPluginsCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_PLUGINS_XML; - } - - /** - * Path to the xml file defining ejb3 service. - */ - public static String getServicePropertiesCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + Locations.STATUS_SERVICE_PROPERTIES; - } - - /** - * Path to the projects.xml file. - */ - public static String getProjectsXmlPath(String portalName) { - return portalName + "/" + ProjectsHelper.PROJECTS_DESC; - } - - /** - * Set containing paths to project.xml files for all projects. - */ - public static Set<String> getProjectXmlPathsSet(String portalName) { - - Set<String> pathsSet = new HashSet<String>(); - - Projects projects = ProjectsHelper.getProjects(portalName); - Set<String> projectIdsSet = projects.getProjectIds( - (PermissionsChecker) new NullPermissionsChecker(), null); - - for (String projectId : projectIdsSet) { - - String projectXmlPath = portalName + "/" + ProjectsHelper.MEMBERS_DIR - + "/" + projectId + "/" + ProjectsHelper.PROJECT_DESC; - pathsSet.add(projectXmlPath); - } - return pathsSet; - } - - /** - * Path to the jsp file responsible file displaying the Status Matrix. - */ - public static String getJspCmPath() { - return STATUS_JSP_DIR + "/" + STATUS_JSP; - } - - /** - * Path to the jsp file responsible for displaying project details. - */ - public static String getPrjDetailsJspCmPath() { - return STATUS_JSP_DIR + "/" + PROJECT_DETAILS_JSP; - } - - /** - * Path to the jsp file responsible displaying column details. - */ - public static String getColumnDetailsJspCmPath() { - return STATUS_JSP_DIR + "/" + COLUMN_DETAILS_JSP; - } - - public static String getShotokuStatusPath(String portalName) { - return ForgeHelper.DYNAMIC_CONTENT_DIR + "/" + SHOTOKU_STATUS_DIR; - } -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java 2006-05-19 19:18:58 UTC (rev 4329) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.forge.status.common; - -/** -* @author Pawel Wrzeszcz -* Status Matrix xml tags. -*/ -public class Tags { - - /* status.xml file tags */ - - /* main page */ - public static final String MAIN_PAGE_COLUMNS_TAG = "main-page"; - - public final static String COLUMN_ELEMENT = "column"; - public final static String COLUMNS_ELEMENT = "columns"; - public static final String COLUMN_NAME_ELEMENT = "name"; - public static final String COLUMN_PLUGIN_ELEMENT = "plugin"; - - public final static String ORDER_PLUGIN_ELEMENT = "order-plugin"; - - /* project page */ - public static final String PROJECT_PAGE_COLUMNS_TAG = "project-page"; - - public static final String ROWS_ELEMENT = "rows"; - public static final String ROW_ELEMENT = "row"; - public static final String ROW_NAME_ELEMENT = "name"; - - public static final String CELLS_ELEMENT = "cells"; - public static final String CELL_ELEMENT = "cell"; - public static final String CELL_NAME_ELEMENT = "name"; - - public static final String METRICS_ELEMENT = "metrics"; - public static final String METRIC_ELEMENT = "metric"; - public static final String METRIC_NAME_ELEMENT = "name"; - public static final String METRIC_PLUGIN_ELEMENT = "plugin"; - - /* service.xml tags */ - public static final String SERVICE_REMOTE_ELEMENT = "service.remote"; - - /* plugins.xml tags */ - public final static String PLUGIN_ELEMENT = "plugin"; - - public final static String PLUGIN_ID_ELEMENT = "id"; - public final static String PLUGIN_CLASS_ELEMENT = "class"; - public final static String PLUGIN_PROPERTIES_ELEMENT = "properties"; - - public static final String JIRA_SERVICE_PROPERTY = "jira-service"; - public static final String SVN_SERVICE_PROPERTY = "svn-service"; - public static final String CC_SERVICE_PROPERTY = "cc-service"; - - public static final String CC_ADRESS_TAG = "cc-address"; - - public static final String STATUS_SERVICE_NAME = "status:service=scores"; - - /** - * This class cannot be instatiated. - */ - private Tags() {}; -} \ No newline at end of file Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java 2006-05-19 19:18:58 UTC (rev 4329) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -1,21 +0,0 @@ -package org.jboss.forge.status.common; - -import org.jboss.forge.status.StatusDescriptor; -import org.jboss.forge.status.StatusConfWatcher; - -import org.jboss.shotoku.aop.CacheItem; - -/** - * Common functions. - * @author Pawel Wrzeszcz - */ -public class Tools { - - @CacheItem - private static StatusConfWatcher conf; - - public static synchronized StatusDescriptor getDesc(final String portalName) { - return conf.get(portalName); - } - -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -25,8 +25,8 @@ import java.util.List; import java.net.MalformedURLException; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.KosmosStatusPlugin; -import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -25,8 +25,8 @@ import java.util.Map; import java.util.HashMap; +import org.jboss.forge.common.projects.Repository; import org.jboss.forge.status.plugins.Plugin; -import org.jboss.forge.status.tools.Tags; /** * @author Pawel Wrzeszcz @@ -61,24 +61,19 @@ long cl = 0; - String url = getProperty(projectId, Tags.SVN_REPO_ADRESS_TAG); + Repository repo = projects.getProjectRepository(projectId); - if (url != null) { + if (repo != null) { - String userName = getProperty(projectId, Tags.SVN_USERNAME_TAG); - String password = getProperty(projectId, Tags.SVN_PASSWD_TAG); + String url = repo.getLocation(); + String userName = repo.getUsername(); + String password = repo.getPassword(); cl = getValue(url, userName, password); + cashedValues.put(projectId, new Long(cl)); } - - cashedValues.put(projectId, new Long(cl)); } return cashedValues.get(projectId).longValue(); } - - private String getProperty(String projectId, String propertyName) { - String prop = projects.getProjectProperty(projectId, propertyName); - return (prop == "" ? null : prop); - } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -25,8 +25,9 @@ import java.util.List; import java.net.MalformedURLException; +import org.jboss.forge.common.projects.IssueTracker; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.KosmosStatusPlugin; -import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; @@ -95,8 +96,14 @@ private String getJiraURL(String projectId) { - String jiraURL = projects.getProjectProperty(projectId, Tags.JIRA_ADRESS_TAG); - return (jiraURL == "" ? null : jiraURL); + IssueTracker it = projects.getProjectIssueTracker(projectId); + + if ((it == null) + || (it.getType() != IssueTracker.JIRA_ISSUE_TRACKER)) { + return null; + } + + return it.getLocation(); } @Override Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -25,8 +25,9 @@ import java.util.List; import java.net.MalformedURLException; +import org.jboss.forge.common.projects.Repository; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.KosmosStatusPlugin; -import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; @@ -62,7 +63,7 @@ String repoURL = getRepoURL(projectId); if (repoURL == null) { - return null; + return null; } SvnRepository repository = null; @@ -95,9 +96,23 @@ return repository; } + + /** + * For the given project id, returns project SVN repository location or + * null if no such project exist or its repository is not SVN repository. + */ private String getRepoURL(String projectId) { - String repoURL = projects.getProjectProperty(projectId, Tags.SVN_REPO_ADRESS_TAG); - return (repoURL == "" ? null : repoURL); + + Repository repository = projects.getProjectRepository(projectId); + if (repository == null) { + return null; + } + + if (repository.getType() == Repository.SVN_REPOSITORY) { + return repository.getLocation(); + } else { + return null; + } } @Override Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -29,7 +29,6 @@ import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.protocol.PluginConf; -import org.jboss.forge.status.service.protocol.PluginValues; import org.jboss.forge.status.service.protocol.PluginsValues; /** @@ -37,12 +36,11 @@ */ public interface ScoresService { - public PluginsValues getPluginsValues(String portalName, - Date date) throws GetScoresException; - public void save(Projects projects, List<PluginConf> pluginsConf, - String portalName) throws ScoresSaveException; - - public PluginValues get(String portalName, String pluginId, Date date) - throws GetScoresException; + String portalName) throws ScoresSaveException; + + public PluginsValues getPluginsValues(String portalName, Date date) + throws GetScoresException; + + public boolean hasPluginsValues(String portalName, Date date); } \ No newline at end of file Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -35,6 +35,7 @@ import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Constants; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.protocol.GetScoresRequest; @@ -56,7 +57,7 @@ @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"), @ActivationConfigProperty(propertyName="destination", - propertyValue="queue/jmm") + propertyValue=Constants.QUEUE_NAME) }) public class ScoresMDB implements MessageListener { @@ -68,16 +69,17 @@ ObjectMessage message = (ObjectMessage) msg; try { - String requestName = message.getStringProperty("name"); + String requestName = + message.getStringProperty(Constants.NAME_PROPERTY); System.out.println("request name: " + requestName); - if (requestName.equals("save")) { + if (requestName.equals(Constants.SAVE_MESSAGE)) { SaveRequest saveRequest = (SaveRequest) message.getObject(); handleRequest(saveRequest); } - if (requestName.equals("getPluginsValues")) { + if (requestName.equals(Constants.GET_SCORES_MESSAGE)) { GetScoresRequest getScoresRequest = (GetScoresRequest) message.getObject(); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -43,16 +43,17 @@ import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Constants; +import org.jboss.forge.status.common.Locations; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.ScoresService; import org.jboss.forge.status.service.ScoresServiceLocal; import org.jboss.forge.status.service.ScoresServiceRemote; -import org.jboss.forge.status.service.impl.protocol.PluginValuesImpl; import org.jboss.forge.status.service.impl.protocol.PluginsValuesImpl; import org.jboss.forge.status.service.protocol.PluginConf; import org.jboss.forge.status.tools.Plugins; -import org.jboss.forge.status.tools.Tools; import org.jboss.logging.Logger; import org.jboss.shotoku.ContentManager; @@ -66,12 +67,12 @@ * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) */ -@Service(objectName=Tools.STATUS_SERVICE_NAME) +@Service(objectName=Tags.STATUS_SERVICE_NAME) @Management(ScoresService.class) @Local(ScoresServiceLocal.class) -@LocalBinding(jndiBinding=Tools.STATUS_LOCAL_SERVICE) +@LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE) @Remote(ScoresServiceRemote.class) -@RemoteBinding(jndiBinding=Tools.STATUS_REMOTE_SERVICE) +@RemoteBinding(jndiBinding=Constants.STATUS_REMOTE_SERVICE) public class ScoresServiceImpl implements ScoresService { private static Logger log = Logger.getLogger(ScoresServiceImpl.class); @@ -99,7 +100,7 @@ // Get directory where we store historical scores Directory rootDir = cm.getRootDirectory(); - String dirName = Tools.getShotokuStatusPath(portalName); + String dirName = Locations.getShotokuStatusPath(portalName); Directory dir = getDir(rootDir, dirName); log.info("Computing scores..."); @@ -181,7 +182,7 @@ Directory dir; try { - dir = rootDir.getDirectory(Tools.getShotokuStatusPath(portalName)); + dir = rootDir.getDirectory(Locations.getShotokuStatusPath(portalName)); } catch (RepositoryException e) { throw new GetScoresException(e); } catch (ResourceDoesNotExist e) { @@ -341,11 +342,16 @@ return getNodeName(today); } - public PluginValuesImpl get(String portalName, String pluginId, Date date) - throws GetScoresException { + public boolean hasPluginsValues(String portalName, Date date) { - PluginsValuesImpl pv = getPluginsValues(portalName, date); - return pv.getPluginValues(pluginId); - } - + PluginsValuesImpl pluginsValues = null; + + try { + pluginsValues = getPluginsValues(portalName, date); + } catch (GetScoresException e) { + return false; + } + + return (pluginsValues != null); + } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -27,9 +27,9 @@ import java.util.Properties; import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException; import org.jboss.forge.status.service.protocol.PluginConf; -import org.jboss.forge.status.tools.Tags; import org.w3c.dom.Node; /** Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -24,8 +24,8 @@ import java.util.Properties; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.ServiceConf; -import org.jboss.forge.status.tools.Tags; import org.jboss.shotoku.Node; /** Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -26,8 +26,8 @@ import java.util.List; import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; import org.w3c.dom.Node; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -34,11 +34,11 @@ import org.jboss.forge.common.projects.permissions.NullPermissionsChecker; import org.jboss.forge.common.projects.permissions.PermissionsChecker; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginValues; import org.jboss.forge.status.service.protocol.PluginsValues; import org.jboss.forge.status.tools.ProjectsByNameComparator; import org.jboss.forge.status.tools.ProjectsByScoreComparator; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -27,8 +27,8 @@ import org.jboss.forge.common.XmlTools; import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; import org.w3c.dom.Node; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -22,9 +22,9 @@ package org.jboss.forge.status.templates; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginValues; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.forge.common.XmlTools; import org.jboss.portal.common.context.DelegateContext; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -26,8 +26,8 @@ import java.util.ArrayList; import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; import org.w3c.dom.Node; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -31,6 +31,7 @@ import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.InvalidPluginPropertiesException; import org.jboss.forge.status.plugins.Plugin; import org.jboss.forge.status.service.protocol.PluginConf; Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -1,185 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.forge.status.tools; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.Date; -import java.util.List; -import java.util.Properties; - -import javax.jms.JMSException; -import javax.jms.ObjectMessage; -import javax.jms.Queue; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.jboss.forge.common.projects.Projects; -import org.jboss.forge.status.exceptions.GetScoresException; -import org.jboss.forge.status.exceptions.ScoresSaveException; -import org.jboss.forge.status.service.impl.protocol.GetScoresRequestImpl; -import org.jboss.forge.status.service.impl.protocol.SaveRequestImpl; -import org.jboss.forge.status.service.protocol.GetScoresRequest; -import org.jboss.forge.status.service.protocol.PluginConf; -import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.service.protocol.SaveRequest; -import org.jboss.forge.status.service.protocol.ServiceConf; - -/** -* @author... [truncated message content] |
|
From: <jbo...@li...> - 2006-06-08 00:36:03
|
Author: dam...@jb...
Date: 2006-06-07 20:35:55 -0400 (Wed, 07 Jun 2006)
New Revision: 4660
Added:
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
Removed:
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Modified:
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java
Log:
MERGE: -r 4659:4658 . to revert 4659.
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -35,7 +35,6 @@
import org.jboss.forge.common.XmlTools;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException;
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
@@ -48,7 +47,8 @@
import org.jboss.forge.status.templates.Columns;
import org.jboss.forge.status.templates.MatrixTemplate;
import org.jboss.forge.status.tools.ScoresManagerSync;
-import org.jboss.forge.status.tools.ScoresManager;
+import org.jboss.forge.status.tools.ScoresManagerAsync;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import org.jboss.portal.common.context.DelegateContext;
@@ -92,12 +92,12 @@
PluginsValues pluginsValues;
try {
- // Get current scores
+ // Compute and save current scores
- ScoresManager.init(portalName, serviceConf);
- ScoresManager.save(projects, pluginsConf);
+ ScoresManagerAsync.init(portalName, serviceConf);
+ ScoresManagerAsync.save(projects, pluginsConf);
- pluginsValues = ScoresManager.getCurrentScores();
+ pluginsValues = ScoresManagerAsync.getCurrentScores();
} catch (ScoresSaveException e) {
log.error("Saving scores failed ", e);
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -24,7 +24,7 @@
import java.util.Map;
import java.util.Set;
-import org.jboss.forge.status.common.Locations;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
@@ -40,16 +40,16 @@
String portalName = key;
- addWatchedPath(key, Locations.getXmlCmPath(portalName));
- addWatchedPath(key, Locations.getXmlStatusPluginsCmPath(portalName));
- addWatchedPath(key, Locations.getServicePropertiesCmPath(portalName));
+ addWatchedPath(key, Tools.getXmlCmPath(portalName));
+ addWatchedPath(key, Tools.getXmlStatusPluginsCmPath(portalName));
+ addWatchedPath(key, Tools.getServicePropertiesCmPath(portalName));
/* Watch projects.xml file */
- addWatchedPath(key, Locations.getProjectsXmlPath(portalName));
+ addWatchedPath(key, Tools.getProjectsXmlPath(portalName));
/* Watch all project.xml files.
* We assume that they contain entries used by plugins */
- Set<String> projectXmlPathsSet = Locations.getProjectXmlPathsSet(portalName);
+ Set<String> projectXmlPathsSet = Tools.getProjectXmlPathsSet(portalName);
for (String projectXmlPath : projectXmlPathsSet) {
addWatchedPath(key, projectXmlPath);
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -25,7 +25,7 @@
import java.util.Map;
import java.io.IOException;
-import org.jboss.forge.status.common.Locations;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.portal.common.context.DelegateContext;
import org.jboss.shotoku.ContentManager;
@@ -53,13 +53,13 @@
public StatusDescriptor(String portalName, ContentManager cm) {
try {
- String statusPath = Locations.getXmlCmPath(portalName);
+ String statusPath = Tools.getXmlCmPath(portalName);
Node statusRoot = getRoot(cm , statusPath);
- String pluginsPath = Locations.getXmlStatusPluginsCmPath(portalName);
+ String pluginsPath = Tools.getXmlStatusPluginsCmPath(portalName);
Node pluginsRoot = getRoot(cm, pluginsPath);
- String servicePath = Locations.getServicePropertiesCmPath(portalName);
+ String servicePath = Tools.getServicePropertiesCmPath(portalName);
org.jboss.shotoku.Node serviceNode = cm.getNode(servicePath);
status = new Status(portalName, statusRoot, pluginsRoot,
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -28,9 +28,7 @@
import javax.portlet.PortletRequestDispatcher;
import org.jboss.forge.common.ForgeHelper;
-import org.jboss.forge.status.common.Locations;
-import org.jboss.forge.status.common.Tools;
-
+import org.jboss.forge.status.tools.Tools;
import org.jboss.portal.common.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
@@ -64,17 +62,17 @@
DelegateContext context = null;
if ((id != null) && (action.equals(PROJECT_DETAILS_ACTION))) {
- jspPath = Locations.getPrjDetailsJspCmPath();
+ jspPath = Tools.getPrjDetailsJspCmPath();
context = desc.getProjectContext(id);
}
if ((id != null) && (action.equals(COLUMN_DETAILS_ACTION))) {
- jspPath = Locations.getColumnDetailsJspCmPath();
+ jspPath = Tools.getColumnDetailsJspCmPath();
context = desc.getColumnContext(id);
}
if (id == null) { // Request for main Matrix page
- jspPath = Locations.getJspCmPath();
+ jspPath = Tools.getJspCmPath();
context = desc.getContext();
}
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -25,8 +25,8 @@
import java.util.List;
import java.net.MalformedURLException;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.plugins.KosmosStatusPlugin;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import com.caucho.hessian.client.HessianProxyFactory;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -25,8 +25,8 @@
import java.util.Map;
import java.util.HashMap;
-import org.jboss.forge.common.projects.Repository;
import org.jboss.forge.status.plugins.Plugin;
+import org.jboss.forge.status.tools.Tags;
/**
* @author Pawel Wrzeszcz
@@ -61,19 +61,24 @@
long cl = 0;
- Repository repo = projects.getProjectRepository(projectId);
+ String url = getProperty(projectId, Tags.SVN_REPO_ADRESS_TAG);
- if (repo != null) {
+ if (url != null) {
- String url = repo.getLocation();
- String userName = repo.getUsername();
- String password = repo.getPassword();
+ String userName = getProperty(projectId, Tags.SVN_USERNAME_TAG);
+ String password = getProperty(projectId, Tags.SVN_PASSWD_TAG);
cl = getValue(url, userName, password);
- cashedValues.put(projectId, new Long(cl));
}
+
+ cashedValues.put(projectId, new Long(cl));
}
return cashedValues.get(projectId).longValue();
}
+
+ private String getProperty(String projectId, String propertyName) {
+ String prop = projects.getProjectProperty(projectId, propertyName);
+ return (prop == "" ? null : prop);
+ }
}
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -25,9 +25,8 @@
import java.util.List;
import java.net.MalformedURLException;
-import org.jboss.forge.common.projects.IssueTracker;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.plugins.KosmosStatusPlugin;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import com.caucho.hessian.client.HessianProxyFactory;
@@ -96,14 +95,8 @@
private String getJiraURL(String projectId) {
- IssueTracker it = projects.getProjectIssueTracker(projectId);
-
- if ((it == null)
- || (it.getType() != IssueTracker.JIRA_ISSUE_TRACKER)) {
- return null;
- }
-
- return it.getLocation();
+ String jiraURL = projects.getProjectProperty(projectId, Tags.JIRA_ADRESS_TAG);
+ return (jiraURL == "" ? null : jiraURL);
}
@Override
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -25,9 +25,8 @@
import java.util.List;
import java.net.MalformedURLException;
-import org.jboss.forge.common.projects.Repository;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.plugins.KosmosStatusPlugin;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import com.caucho.hessian.client.HessianProxyFactory;
@@ -63,7 +62,7 @@
String repoURL = getRepoURL(projectId);
if (repoURL == null) {
- return null;
+ return null;
}
SvnRepository repository = null;
@@ -96,23 +95,9 @@
return repository;
}
-
- /**
- * For the given project id, returns project SVN repository location or
- * null if no such project exist or its repository is not SVN repository.
- */
private String getRepoURL(String projectId) {
-
- Repository repository = projects.getProjectRepository(projectId);
- if (repository == null) {
- return null;
- }
-
- if (repository.getType() == Repository.SVN_REPOSITORY) {
- return repository.getLocation();
- } else {
- return null;
- }
+ String repoURL = projects.getProjectProperty(projectId, Tags.SVN_REPO_ADRESS_TAG);
+ return (repoURL == "" ? null : repoURL);
}
@Override
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -29,6 +29,7 @@
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.protocol.PluginConf;
+import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
/**
@@ -36,11 +37,12 @@
*/
public interface ScoresService {
+ public PluginsValues getPluginsValues(String portalName,
+ Date date) throws GetScoresException;
+
public void save(Projects projects, List<PluginConf> pluginsConf,
- String portalName) throws ScoresSaveException;
-
- public PluginsValues getPluginsValues(String portalName, Date date)
- throws GetScoresException;
-
- public boolean hasPluginsValues(String portalName, Date date);
+ String portalName) throws ScoresSaveException;
+
+ public PluginValues get(String portalName, String pluginId, Date date)
+ throws GetScoresException;
}
\ No newline at end of file
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -35,7 +35,6 @@
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Constants;
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.protocol.GetScoresRequest;
@@ -57,7 +56,7 @@
@ActivationConfigProperty(propertyName="destinationType",
propertyValue="javax.jms.Queue"),
@ActivationConfigProperty(propertyName="destination",
- propertyValue=Constants.QUEUE_NAME)
+ propertyValue="queue/jmm")
})
public class ScoresMDB implements MessageListener {
@@ -69,17 +68,16 @@
ObjectMessage message = (ObjectMessage) msg;
try {
- String requestName =
- message.getStringProperty(Constants.NAME_PROPERTY);
+ String requestName = message.getStringProperty("name");
System.out.println("request name: " + requestName);
- if (requestName.equals(Constants.SAVE_MESSAGE)) {
+ if (requestName.equals("save")) {
SaveRequest saveRequest = (SaveRequest) message.getObject();
handleRequest(saveRequest);
}
- if (requestName.equals(Constants.GET_SCORES_MESSAGE)) {
+ if (requestName.equals("getPluginsValues")) {
GetScoresRequest getScoresRequest =
(GetScoresRequest) message.getObject();
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -43,17 +43,16 @@
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Constants;
-import org.jboss.forge.status.common.Locations;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.ScoresService;
import org.jboss.forge.status.service.ScoresServiceLocal;
import org.jboss.forge.status.service.ScoresServiceRemote;
+import org.jboss.forge.status.service.impl.protocol.PluginValuesImpl;
import org.jboss.forge.status.service.impl.protocol.PluginsValuesImpl;
import org.jboss.forge.status.service.protocol.PluginConf;
import org.jboss.forge.status.tools.Plugins;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.logging.Logger;
import org.jboss.shotoku.ContentManager;
@@ -67,12 +66,12 @@
* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
*/
-@Service(objectName=Tags.STATUS_SERVICE_NAME)
+@Service(objectName=Tools.STATUS_SERVICE_NAME)
@Management(ScoresService.class)
@Local(ScoresServiceLocal.class)
-@LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE)
+@LocalBinding(jndiBinding=Tools.STATUS_LOCAL_SERVICE)
@Remote(ScoresServiceRemote.class)
-@RemoteBinding(jndiBinding=Constants.STATUS_REMOTE_SERVICE)
+@RemoteBinding(jndiBinding=Tools.STATUS_REMOTE_SERVICE)
public class ScoresServiceImpl implements ScoresService {
private static Logger log = Logger.getLogger(ScoresServiceImpl.class);
@@ -100,7 +99,7 @@
// Get directory where we store historical scores
Directory rootDir = cm.getRootDirectory();
- String dirName = Locations.getShotokuStatusPath(portalName);
+ String dirName = Tools.getShotokuStatusPath(portalName);
Directory dir = getDir(rootDir, dirName);
log.info("Computing scores...");
@@ -182,7 +181,7 @@
Directory dir;
try {
- dir = rootDir.getDirectory(Locations.getShotokuStatusPath(portalName));
+ dir = rootDir.getDirectory(Tools.getShotokuStatusPath(portalName));
} catch (RepositoryException e) {
throw new GetScoresException(e);
} catch (ResourceDoesNotExist e) {
@@ -342,16 +341,11 @@
return getNodeName(today);
}
- public boolean hasPluginsValues(String portalName, Date date) {
+ public PluginValuesImpl get(String portalName, String pluginId, Date date)
+ throws GetScoresException {
- PluginsValuesImpl pluginsValues = null;
-
- try {
- pluginsValues = getPluginsValues(portalName, date);
- } catch (GetScoresException e) {
- return false;
- }
-
- return (pluginsValues != null);
- }
+ PluginsValuesImpl pv = getPluginsValues(portalName, date);
+ return pv.getPluginValues(pluginId);
+ }
+
}
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -27,9 +27,9 @@
import java.util.Properties;
import org.jboss.forge.common.XmlTools;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException;
import org.jboss.forge.status.service.protocol.PluginConf;
+import org.jboss.forge.status.tools.Tags;
import org.w3c.dom.Node;
/**
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -24,8 +24,8 @@
import java.util.Properties;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.ServiceConf;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.shotoku.Node;
/**
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -26,8 +26,8 @@
import java.util.List;
import org.jboss.forge.common.XmlTools;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -34,11 +34,11 @@
import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
import org.jboss.forge.status.tools.ProjectsByNameComparator;
import org.jboss.forge.status.tools.ProjectsByScoreComparator;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -27,8 +27,8 @@
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -22,9 +22,9 @@
package org.jboss.forge.status.templates;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.forge.common.XmlTools;
import org.jboss.portal.common.context.DelegateContext;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -26,8 +26,8 @@
import java.util.ArrayList;
import org.jboss.forge.common.XmlTools;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -31,7 +31,6 @@
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.exceptions.InvalidPluginPropertiesException;
import org.jboss.forge.status.plugins.Plugin;
import org.jboss.forge.status.service.protocol.PluginConf;
Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -1,183 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.forge.status.tools;
-
-import java.io.Serializable;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.exceptions.GetScoresException;
-import org.jboss.forge.status.exceptions.ScoresSaveException;
-import org.jboss.forge.status.service.impl.protocol.GetScoresRequestImpl;
-import org.jboss.forge.status.service.impl.protocol.SaveRequestImpl;
-import org.jboss.forge.status.service.protocol.GetScoresRequest;
-import org.jboss.forge.status.service.protocol.PluginConf;
-import org.jboss.forge.status.service.protocol.PluginsValues;
-import org.jboss.forge.status.service.protocol.SaveRequest;
-import org.jboss.forge.status.service.protocol.ServiceConf;
-import org.jboss.forge.status.common.Constants;
-
-/**
-* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
-*/
-
-public class ScoresManager {
-
- private static boolean isRemote;
- private static Properties properties;
-
- public static void init(String portalName, ServiceConf serviceConf) {
-
- ScoresManagerSync.init(portalName, serviceConf); //TODO inheritance
-
- isRemote = serviceConf.isRemote();
- System.out.println("remote: " + isRemote);
-
- properties = serviceConf.getProperties();
- }
-
- public static void save(Projects projects, List<PluginConf> pluginsConf)
- throws ScoresSaveException {
-
- SaveRequest saveRequest = new SaveRequestImpl(pluginsConf, projects);
- //TODO request factory
- //conf factory?
-
- // Send message
- try {
- sendMessage(Constants.SAVE_MESSAGE, saveRequest);
- } catch (Exception e) {
- throw new ScoresSaveException(e);
- }
- }
-
- public static PluginsValues getScores(Date date, Date toDate)
- throws GetScoresException {
- //TODO toDate
-
- Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-
- GetScoresRequest getScoresRequest =
- new GetScoresRequestImpl(date, toDate, timestamp);
-
- // Send message
- try {
- sendMessage(Constants.GET_SCORES_MESSAGE, getScoresRequest);
- } catch (Exception e) {
- throw new GetScoresException(e);
- }
-
- PluginsValues pluginsValues = null;
- int attempts = 0;
-
- for (;;) {
-
- pluginsValues = RecordManager.get(timestamp);
-
- System.out.println("attempt: " + pluginsValues);
-
- if ((pluginsValues != null) ||
- ((attempts++) == Constants.MAX_ATTEMPTS)) {
- break;
- }
-
- try {
- Thread.sleep(Constants.SLEEP_TIME);
- } catch (InterruptedException e) {
- throw new GetScoresException(e);
- }
- }
-
- return pluginsValues;
- }
-
- /**
- * For the specified plugin returns historical project score
- * from the given <code>date</code> in the past.
- * If scores from specified day are not available,
- * the next available scores saved at the day before or equal
- * to <code>toDate</code> are returned.
- *
- * Notice that only year, month and day matter in passed dates.
- *
- * @return project score from the given date for specified plugin
- * @throws GetScoresException
- */
- public static long getValue(String pluginId, String projectId,
- Date date, Date toDate)
- throws GetScoresException {
-
- PluginsValues pluginsValues = getScores(date, toDate);
-
- return pluginsValues.getPluginValue(pluginId, projectId);
- }
-
- public static PluginsValues getCurrentScores()
- throws GetScoresException {
-
- Date now = new Date();
-
- return getScores(now, now);
- }
-
- private static void sendMessage(String name, Serializable request) throws
- NamingException, JMSException {
-
- Queue queue = null;
- QueueConnection connection = null;
- QueueSession session = null;
- QueueSender sender = null;
- Context context = new InitialContext(properties);
-
- queue = (Queue) context.lookup(Constants.QUEUE_NAME);
- QueueConnectionFactory factory =
- (QueueConnectionFactory) context.lookup("ConnectionFactory");
- connection = factory.createQueueConnection();
- session = connection.createQueueSession(false,
- QueueSession.AUTO_ACKNOWLEDGE);
-
- // Create message
- ObjectMessage message = session.createObjectMessage();
- message.setStringProperty("name", name);
- message.setObject(request);
-
- sender = session.createSender(queue);
- sender.send(message);
- session.close ();
- }
-
-}
Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java (from rev 4658, labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java)
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-08 00:34:35 UTC (rev 4659)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-08 00:35:55 UTC (rev 4660)
@@ -32,7 +32,6 @@
import javax.rmi.PortableRemoteObject;
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Constants;
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.ScoresService;
@@ -130,8 +129,8 @@
// Perform look up using JNDI name of ejb object
String serviceBinding =
- (isRemote ? Constants.STATUS_REMOTE_SERVICE :
- Constants.STATUS_LOCAL_SERVICE);
+ (isRemote ? Tools.STATUS_REMOTE_SERVICE :
+ Tools.STATUS_LOCAL_SERVICE);
Object ref = context.lookup(serviceBinding);
// Narrow the reference of the object returned by lookup() method
Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java (from rev 4658, labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java)
Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java (from rev 4658, labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java)
|
|
From: <jbo...@li...> - 2006-06-08 00:34:41
|
Author: dam...@jb... Date: 2006-06-07 20:34:35 -0400 (Wed, 07 Jun 2006) New Revision: 4659 Added: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java Removed: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java Log: MERGED: r 4289:4329 https://svn.labs.jboss.com/labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status because I am sick. Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -35,6 +35,7 @@ import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; @@ -47,8 +48,7 @@ import org.jboss.forge.status.templates.Columns; import org.jboss.forge.status.templates.MatrixTemplate; import org.jboss.forge.status.tools.ScoresManagerSync; -import org.jboss.forge.status.tools.ScoresManagerAsync; -import org.jboss.forge.status.tools.Tags; +import org.jboss.forge.status.tools.ScoresManager; import org.jboss.logging.Logger; import org.jboss.portal.common.context.DelegateContext; @@ -92,12 +92,12 @@ PluginsValues pluginsValues; try { - // Compute and save current scores + // Get current scores - ScoresManagerAsync.init(portalName, serviceConf); - ScoresManagerAsync.save(projects, pluginsConf); + ScoresManager.init(portalName, serviceConf); + ScoresManager.save(projects, pluginsConf); - pluginsValues = ScoresManagerAsync.getCurrentScores(); + pluginsValues = ScoresManager.getCurrentScores(); } catch (ScoresSaveException e) { log.error("Saving scores failed ", e); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; -import org.jboss.forge.status.tools.Tools; +import org.jboss.forge.status.common.Locations; import org.jboss.shotoku.cache.ChangeType; import org.jboss.shotoku.cache.ShotokuResourceWatcher; @@ -40,16 +40,16 @@ String portalName = key; - addWatchedPath(key, Tools.getXmlCmPath(portalName)); - addWatchedPath(key, Tools.getXmlStatusPluginsCmPath(portalName)); - addWatchedPath(key, Tools.getServicePropertiesCmPath(portalName)); + addWatchedPath(key, Locations.getXmlCmPath(portalName)); + addWatchedPath(key, Locations.getXmlStatusPluginsCmPath(portalName)); + addWatchedPath(key, Locations.getServicePropertiesCmPath(portalName)); /* Watch projects.xml file */ - addWatchedPath(key, Tools.getProjectsXmlPath(portalName)); + addWatchedPath(key, Locations.getProjectsXmlPath(portalName)); /* Watch all project.xml files. * We assume that they contain entries used by plugins */ - Set<String> projectXmlPathsSet = Tools.getProjectXmlPathsSet(portalName); + Set<String> projectXmlPathsSet = Locations.getProjectXmlPathsSet(portalName); for (String projectXmlPath : projectXmlPathsSet) { addWatchedPath(key, projectXmlPath); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -25,7 +25,7 @@ import java.util.Map; import java.io.IOException; -import org.jboss.forge.status.tools.Tools; +import org.jboss.forge.status.common.Locations; import org.jboss.portal.common.context.DelegateContext; import org.jboss.shotoku.ContentManager; @@ -53,13 +53,13 @@ public StatusDescriptor(String portalName, ContentManager cm) { try { - String statusPath = Tools.getXmlCmPath(portalName); + String statusPath = Locations.getXmlCmPath(portalName); Node statusRoot = getRoot(cm , statusPath); - String pluginsPath = Tools.getXmlStatusPluginsCmPath(portalName); + String pluginsPath = Locations.getXmlStatusPluginsCmPath(portalName); Node pluginsRoot = getRoot(cm, pluginsPath); - String servicePath = Tools.getServicePropertiesCmPath(portalName); + String servicePath = Locations.getServicePropertiesCmPath(portalName); org.jboss.shotoku.Node serviceNode = cm.getNode(servicePath); status = new Status(portalName, statusRoot, pluginsRoot, Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -28,7 +28,9 @@ import javax.portlet.PortletRequestDispatcher; import org.jboss.forge.common.ForgeHelper; -import org.jboss.forge.status.tools.Tools; +import org.jboss.forge.status.common.Locations; +import org.jboss.forge.status.common.Tools; + import org.jboss.portal.common.context.DelegateContext; import org.jboss.portal.core.servlet.jsp.PortalJsp; @@ -62,17 +64,17 @@ DelegateContext context = null; if ((id != null) && (action.equals(PROJECT_DETAILS_ACTION))) { - jspPath = Tools.getPrjDetailsJspCmPath(); + jspPath = Locations.getPrjDetailsJspCmPath(); context = desc.getProjectContext(id); } if ((id != null) && (action.equals(COLUMN_DETAILS_ACTION))) { - jspPath = Tools.getColumnDetailsJspCmPath(); + jspPath = Locations.getColumnDetailsJspCmPath(); context = desc.getColumnContext(id); } if (id == null) { // Request for main Matrix page - jspPath = Tools.getJspCmPath(); + jspPath = Locations.getJspCmPath(); context = desc.getContext(); } Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-05-19 19:18:58 UTC (rev 4329) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -1,28 +0,0 @@ -package org.jboss.forge.status.common; - -/** - * @author Pawel Wrzeszcz - */ -public class Constants { - - - /* The length of time to sleep (in milliseconds) - * if requested scores are not available */ - public static final long SLEEP_TIME = 2000; - public static final int MAX_ATTEMPTS = 10; - - public static final String QUEUE_NAME = "queue/jmm"; - - public static final String NAME_PROPERTY = "name"; - public static final String SAVE_MESSAGE = "save"; - public static final String GET_SCORES_MESSAGE = "get"; - - public static final String STATUS_LOCAL_SERVICE = "Status/LocalScoresService"; - public static final String STATUS_REMOTE_SERVICE = "Status/RemoteScoresService"; - - /** - * This class cannot be instatiated. - */ - private Constants() {}; - -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java 2006-05-19 19:18:58 UTC (rev 4329) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -1,106 +0,0 @@ -package org.jboss.forge.status.common; - -import java.util.HashSet; -import java.util.Set; - -import org.jboss.forge.common.ForgeHelper; -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.PermissionsChecker; - -/** - * Common functions. - * @author Pawel Wrzeszcz - */ -public class Locations { - - /** <code>STATUS_XML<code> - file defining the list of watched feeds */ - private final static String STATUS_XML = "status.xml"; - private final static String STATUS_PLUGINS_XML = "plugins.xml"; - private final static String STATUS_SERVICE_PROPERTIES = "service.properties"; - - /** <code>STATUS_DIR</code> - directory in which file <code>STATUS_XML<code> is stored. */ - private final static String STATUS_DIR = "status"; - - private final static String STATUS_JSP = "status.jsp"; - private final static String STATUS_JSP_DIR = "status"; - private final static String PROJECT_DETAILS_JSP = "project_details.jsp"; - private final static String COLUMN_DETAILS_JSP = "column_details.jsp"; - - /** Shotoku directory to store historical scores */ - private static final String SHOTOKU_STATUS_DIR = "status"; - - /** - * Path to the xml file with the Status Matrix properties. - */ - public static String getXmlCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_XML; - } - - /** - * Path to the xml file defining Plugins used in the Matrix. - */ - public static String getXmlStatusPluginsCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_PLUGINS_XML; - } - - /** - * Path to the xml file defining ejb3 service. - */ - public static String getServicePropertiesCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + Locations.STATUS_SERVICE_PROPERTIES; - } - - /** - * Path to the projects.xml file. - */ - public static String getProjectsXmlPath(String portalName) { - return portalName + "/" + ProjectsHelper.PROJECTS_DESC; - } - - /** - * Set containing paths to project.xml files for all projects. - */ - public static Set<String> getProjectXmlPathsSet(String portalName) { - - Set<String> pathsSet = new HashSet<String>(); - - Projects projects = ProjectsHelper.getProjects(portalName); - Set<String> projectIdsSet = projects.getProjectIds( - (PermissionsChecker) new NullPermissionsChecker(), null); - - for (String projectId : projectIdsSet) { - - String projectXmlPath = portalName + "/" + ProjectsHelper.MEMBERS_DIR - + "/" + projectId + "/" + ProjectsHelper.PROJECT_DESC; - pathsSet.add(projectXmlPath); - } - return pathsSet; - } - - /** - * Path to the jsp file responsible file displaying the Status Matrix. - */ - public static String getJspCmPath() { - return STATUS_JSP_DIR + "/" + STATUS_JSP; - } - - /** - * Path to the jsp file responsible for displaying project details. - */ - public static String getPrjDetailsJspCmPath() { - return STATUS_JSP_DIR + "/" + PROJECT_DETAILS_JSP; - } - - /** - * Path to the jsp file responsible displaying column details. - */ - public static String getColumnDetailsJspCmPath() { - return STATUS_JSP_DIR + "/" + COLUMN_DETAILS_JSP; - } - - public static String getShotokuStatusPath(String portalName) { - return ForgeHelper.DYNAMIC_CONTENT_DIR + "/" + SHOTOKU_STATUS_DIR; - } -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java 2006-05-19 19:18:58 UTC (rev 4329) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.forge.status.common; - -/** -* @author Pawel Wrzeszcz -* Status Matrix xml tags. -*/ -public class Tags { - - /* status.xml file tags */ - - /* main page */ - public static final String MAIN_PAGE_COLUMNS_TAG = "main-page"; - - public final static String COLUMN_ELEMENT = "column"; - public final static String COLUMNS_ELEMENT = "columns"; - public static final String COLUMN_NAME_ELEMENT = "name"; - public static final String COLUMN_PLUGIN_ELEMENT = "plugin"; - - public final static String ORDER_PLUGIN_ELEMENT = "order-plugin"; - - /* project page */ - public static final String PROJECT_PAGE_COLUMNS_TAG = "project-page"; - - public static final String ROWS_ELEMENT = "rows"; - public static final String ROW_ELEMENT = "row"; - public static final String ROW_NAME_ELEMENT = "name"; - - public static final String CELLS_ELEMENT = "cells"; - public static final String CELL_ELEMENT = "cell"; - public static final String CELL_NAME_ELEMENT = "name"; - - public static final String METRICS_ELEMENT = "metrics"; - public static final String METRIC_ELEMENT = "metric"; - public static final String METRIC_NAME_ELEMENT = "name"; - public static final String METRIC_PLUGIN_ELEMENT = "plugin"; - - /* service.xml tags */ - public static final String SERVICE_REMOTE_ELEMENT = "service.remote"; - - /* plugins.xml tags */ - public final static String PLUGIN_ELEMENT = "plugin"; - - public final static String PLUGIN_ID_ELEMENT = "id"; - public final static String PLUGIN_CLASS_ELEMENT = "class"; - public final static String PLUGIN_PROPERTIES_ELEMENT = "properties"; - - public static final String JIRA_SERVICE_PROPERTY = "jira-service"; - public static final String SVN_SERVICE_PROPERTY = "svn-service"; - public static final String CC_SERVICE_PROPERTY = "cc-service"; - - public static final String CC_ADRESS_TAG = "cc-address"; - - public static final String STATUS_SERVICE_NAME = "status:service=scores"; - - /** - * This class cannot be instatiated. - */ - private Tags() {}; -} \ No newline at end of file Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java 2006-05-19 19:18:58 UTC (rev 4329) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -1,21 +0,0 @@ -package org.jboss.forge.status.common; - -import org.jboss.forge.status.StatusDescriptor; -import org.jboss.forge.status.StatusConfWatcher; - -import org.jboss.shotoku.aop.CacheItem; - -/** - * Common functions. - * @author Pawel Wrzeszcz - */ -public class Tools { - - @CacheItem - private static StatusConfWatcher conf; - - public static synchronized StatusDescriptor getDesc(final String portalName) { - return conf.get(portalName); - } - -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -25,8 +25,8 @@ import java.util.List; import java.net.MalformedURLException; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.KosmosStatusPlugin; -import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -25,8 +25,8 @@ import java.util.Map; import java.util.HashMap; +import org.jboss.forge.common.projects.Repository; import org.jboss.forge.status.plugins.Plugin; -import org.jboss.forge.status.tools.Tags; /** * @author Pawel Wrzeszcz @@ -61,24 +61,19 @@ long cl = 0; - String url = getProperty(projectId, Tags.SVN_REPO_ADRESS_TAG); + Repository repo = projects.getProjectRepository(projectId); - if (url != null) { + if (repo != null) { - String userName = getProperty(projectId, Tags.SVN_USERNAME_TAG); - String password = getProperty(projectId, Tags.SVN_PASSWD_TAG); + String url = repo.getLocation(); + String userName = repo.getUsername(); + String password = repo.getPassword(); cl = getValue(url, userName, password); + cashedValues.put(projectId, new Long(cl)); } - - cashedValues.put(projectId, new Long(cl)); } return cashedValues.get(projectId).longValue(); } - - private String getProperty(String projectId, String propertyName) { - String prop = projects.getProjectProperty(projectId, propertyName); - return (prop == "" ? null : prop); - } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -25,8 +25,9 @@ import java.util.List; import java.net.MalformedURLException; +import org.jboss.forge.common.projects.IssueTracker; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.KosmosStatusPlugin; -import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; @@ -95,8 +96,14 @@ private String getJiraURL(String projectId) { - String jiraURL = projects.getProjectProperty(projectId, Tags.JIRA_ADRESS_TAG); - return (jiraURL == "" ? null : jiraURL); + IssueTracker it = projects.getProjectIssueTracker(projectId); + + if ((it == null) + || (it.getType() != IssueTracker.JIRA_ISSUE_TRACKER)) { + return null; + } + + return it.getLocation(); } @Override Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -25,8 +25,9 @@ import java.util.List; import java.net.MalformedURLException; +import org.jboss.forge.common.projects.Repository; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.KosmosStatusPlugin; -import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; @@ -62,7 +63,7 @@ String repoURL = getRepoURL(projectId); if (repoURL == null) { - return null; + return null; } SvnRepository repository = null; @@ -95,9 +96,23 @@ return repository; } + + /** + * For the given project id, returns project SVN repository location or + * null if no such project exist or its repository is not SVN repository. + */ private String getRepoURL(String projectId) { - String repoURL = projects.getProjectProperty(projectId, Tags.SVN_REPO_ADRESS_TAG); - return (repoURL == "" ? null : repoURL); + + Repository repository = projects.getProjectRepository(projectId); + if (repository == null) { + return null; + } + + if (repository.getType() == Repository.SVN_REPOSITORY) { + return repository.getLocation(); + } else { + return null; + } } @Override Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -29,7 +29,6 @@ import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.protocol.PluginConf; -import org.jboss.forge.status.service.protocol.PluginValues; import org.jboss.forge.status.service.protocol.PluginsValues; /** @@ -37,12 +36,11 @@ */ public interface ScoresService { - public PluginsValues getPluginsValues(String portalName, - Date date) throws GetScoresException; - public void save(Projects projects, List<PluginConf> pluginsConf, - String portalName) throws ScoresSaveException; - - public PluginValues get(String portalName, String pluginId, Date date) - throws GetScoresException; + String portalName) throws ScoresSaveException; + + public PluginsValues getPluginsValues(String portalName, Date date) + throws GetScoresException; + + public boolean hasPluginsValues(String portalName, Date date); } \ No newline at end of file Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -35,6 +35,7 @@ import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Constants; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.protocol.GetScoresRequest; @@ -56,7 +57,7 @@ @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"), @ActivationConfigProperty(propertyName="destination", - propertyValue="queue/jmm") + propertyValue=Constants.QUEUE_NAME) }) public class ScoresMDB implements MessageListener { @@ -68,16 +69,17 @@ ObjectMessage message = (ObjectMessage) msg; try { - String requestName = message.getStringProperty("name"); + String requestName = + message.getStringProperty(Constants.NAME_PROPERTY); System.out.println("request name: " + requestName); - if (requestName.equals("save")) { + if (requestName.equals(Constants.SAVE_MESSAGE)) { SaveRequest saveRequest = (SaveRequest) message.getObject(); handleRequest(saveRequest); } - if (requestName.equals("getPluginsValues")) { + if (requestName.equals(Constants.GET_SCORES_MESSAGE)) { GetScoresRequest getScoresRequest = (GetScoresRequest) message.getObject(); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -43,16 +43,17 @@ import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Constants; +import org.jboss.forge.status.common.Locations; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.ScoresService; import org.jboss.forge.status.service.ScoresServiceLocal; import org.jboss.forge.status.service.ScoresServiceRemote; -import org.jboss.forge.status.service.impl.protocol.PluginValuesImpl; import org.jboss.forge.status.service.impl.protocol.PluginsValuesImpl; import org.jboss.forge.status.service.protocol.PluginConf; import org.jboss.forge.status.tools.Plugins; -import org.jboss.forge.status.tools.Tools; import org.jboss.logging.Logger; import org.jboss.shotoku.ContentManager; @@ -66,12 +67,12 @@ * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) */ -@Service(objectName=Tools.STATUS_SERVICE_NAME) +@Service(objectName=Tags.STATUS_SERVICE_NAME) @Management(ScoresService.class) @Local(ScoresServiceLocal.class) -@LocalBinding(jndiBinding=Tools.STATUS_LOCAL_SERVICE) +@LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE) @Remote(ScoresServiceRemote.class) -@RemoteBinding(jndiBinding=Tools.STATUS_REMOTE_SERVICE) +@RemoteBinding(jndiBinding=Constants.STATUS_REMOTE_SERVICE) public class ScoresServiceImpl implements ScoresService { private static Logger log = Logger.getLogger(ScoresServiceImpl.class); @@ -99,7 +100,7 @@ // Get directory where we store historical scores Directory rootDir = cm.getRootDirectory(); - String dirName = Tools.getShotokuStatusPath(portalName); + String dirName = Locations.getShotokuStatusPath(portalName); Directory dir = getDir(rootDir, dirName); log.info("Computing scores..."); @@ -181,7 +182,7 @@ Directory dir; try { - dir = rootDir.getDirectory(Tools.getShotokuStatusPath(portalName)); + dir = rootDir.getDirectory(Locations.getShotokuStatusPath(portalName)); } catch (RepositoryException e) { throw new GetScoresException(e); } catch (ResourceDoesNotExist e) { @@ -341,11 +342,16 @@ return getNodeName(today); } - public PluginValuesImpl get(String portalName, String pluginId, Date date) - throws GetScoresException { + public boolean hasPluginsValues(String portalName, Date date) { - PluginsValuesImpl pv = getPluginsValues(portalName, date); - return pv.getPluginValues(pluginId); - } - + PluginsValuesImpl pluginsValues = null; + + try { + pluginsValues = getPluginsValues(portalName, date); + } catch (GetScoresException e) { + return false; + } + + return (pluginsValues != null); + } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -27,9 +27,9 @@ import java.util.Properties; import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException; import org.jboss.forge.status.service.protocol.PluginConf; -import org.jboss.forge.status.tools.Tags; import org.w3c.dom.Node; /** Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -24,8 +24,8 @@ import java.util.Properties; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.ServiceConf; -import org.jboss.forge.status.tools.Tags; import org.jboss.shotoku.Node; /** Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -26,8 +26,8 @@ import java.util.List; import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; import org.w3c.dom.Node; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -34,11 +34,11 @@ import org.jboss.forge.common.projects.permissions.NullPermissionsChecker; import org.jboss.forge.common.projects.permissions.PermissionsChecker; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginValues; import org.jboss.forge.status.service.protocol.PluginsValues; import org.jboss.forge.status.tools.ProjectsByNameComparator; import org.jboss.forge.status.tools.ProjectsByScoreComparator; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -27,8 +27,8 @@ import org.jboss.forge.common.XmlTools; import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; import org.w3c.dom.Node; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -22,9 +22,9 @@ package org.jboss.forge.status.templates; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginValues; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.forge.common.XmlTools; import org.jboss.portal.common.context.DelegateContext; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -26,8 +26,8 @@ import java.util.ArrayList; import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; import org.w3c.dom.Node; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -31,6 +31,7 @@ import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.InvalidPluginPropertiesException; import org.jboss.forge.status.plugins.Plugin; import org.jboss.forge.status.service.protocol.PluginConf; Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -1,185 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.forge.status.tools; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.Date; -import java.util.List; -import java.util.Properties; - -import javax.jms.JMSException; -import javax.jms.ObjectMessage; -import javax.jms.Queue; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.jboss.forge.common.projects.Projects; -import org.jboss.forge.status.exceptions.GetScoresException; -import org.jboss.forge.status.exceptions.ScoresSaveException; -import org.jboss.forge.status.service.impl.protocol.GetScoresRequestImpl; -import org.jboss.forge.status.service.impl.protocol.SaveRequestImpl; -import org.jboss.forge.status.service.protocol.GetScoresRequest; -import org.jboss.forge.status.service.protocol.PluginConf; -import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.service.protocol.SaveRequest; -import org.jboss.forge.status.service.protocol.ServiceConf; - -/** -* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) -*/ - -public class ScoresManagerAsync { - - private static boolean isRemote; - private static Properties properties; - - public static void init(String portalName, ServiceConf serviceConf) { - - ScoresManagerSync.init(portalName, serviceConf); //TODO inheritance - - isRemote = serviceConf.isRemote(); - System.out.println("remote: " + isRemote); - - properties = serviceConf.getProperties(); - } - - public static void save(Projects projects, List<PluginConf> pluginsConf) - throws ScoresSaveException { - - SaveRequest saveRequest = new SaveRequestImpl(pluginsConf, projects); - //TODO request factory - //conf factory? - - // Send message - try { - sendMessage("save", saveRequest); - } catch (Exception e) { - throw new ScoresSaveException(e); - } - - // TODO poll/wait for results - } - - public static PluginsValues getScores(Date date, Date toDate) - throws GetScoresException { - //TODO toDate - - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - - GetScoresRequest getScoresRequest = - new GetScoresRequestImpl(date, toDate, timestamp); - - // Send message - try { - sendMessage("getPluginsValues", getScoresRequest); - } catch (Exception e) { - throw new GetScoresException(e); - } - - // poll/wait for results - - PluginsValues pluginsValues = null; - - for (;;) { //TODO when we give up? - - pluginsValues = RecordManager.get(timestamp); - - System.out.println("attempt: " + pluginsValues); - - if (pluginsValues != null) { - break; - } - - try { - Thread.sleep(2000); //TODO const - } catch (InterruptedException e) { - throw new GetScoresException(e); - } - } - - return pluginsValues; - } - - /** - * For the specified plugin returns historical project score - * from the given <code>date</code> in the past. - * If scores from specified day are not available, - * the next available scores saved at the day before or equal - * to <code>toDate</code> are returned. - * - * Notice that only year, month and day matter in passed dates. - * - * @return project score from the given date for specified plugin - * @throws GetScoresException - */ - public static long getValue(String pluginId, String projectId, - Date date, Date toDate) - throws GetScoresException { - - PluginsValues pluginsValues = getScores(date, toDate); - - return pluginsValues.getPluginValue(pluginId, projectId); - } - - public static PluginsValues getCurrentScores() - throws GetScoresException { - - Date now = new Date(); - - return getScores(now, now); - } - - private static void sendMessage(String name, Serializable request) throws - NamingException, JMSException { - - Queue queue = null; - QueueConnection connection = null; - QueueSession session = null; - QueueSender sender = null; - Context context = new InitialContext(properties); - - queue = (Queue) context.lookup("queue/jmm"); //TODO const - QueueConnectionFactory factory = - (QueueConnectionFactory) context.lookup("ConnectionFactory"); - connection = factory.createQueueConnection(); - session = connection.createQueueSession(false, - QueueSession.AUTO_ACKNOWLEDGE); - - // Create message - ObjectMessage message = session.createObjectMessage(); - message.setStringProperty("name", name); - message.setObject(request); - - sender = session.createSender(queue); - sender.send(message); - // sess.commit (); TODO closing vs committing - session.close (); - } - -} Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -32,6 +32,7 @@ import javax.rmi.PortableRemoteObject; import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Constants; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.ScoresService; @@ -129,8 +130,8 @@ // Perform look up using JNDI name of ejb object String serviceBinding = - (isRemote ? Tools.STATUS_REMOTE_SERVICE : - Tools.STATUS_LOCAL_SERVICE); + (isRemote ? Constants.STATUS_REMOTE_SERVICE : + Constants.STATUS_LOCAL_SERVICE); Object ref = context.lookup(serviceBinding); // Narrow the reference of the object returned by lookup() method Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -1,85 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.forge.status.tools; - -/** -* @author Pawel Wrzeszcz -* Status Matrix xml tags. -*/ -public class Tags { - - /* status.xml file tags */ - - /* main page */ - public static final String MAIN_PAGE_COLUMNS_TAG = "main-page"; - - public final static String COLUMN_ELEMENT = "column"; - public final static String COLUMNS_ELEMENT = "columns"; - public static final String COLUMN_NAME_ELEMENT = "name"; - public static final String COLUMN_PLUGIN_ELEMENT = "plugin"; - - public final static String ORDER_PLUGIN_ELEMENT = "order-plugin"; - - /* project page */ - public static final String PROJECT_PAGE_COLUMNS_TAG = "project-page"; - - public static final String ROWS_ELEMENT = "rows"; - public static final String ROW_ELEMENT = "row"; - public static final String ROW_NAME_ELEMENT = "name"; - - public static final String CELLS_ELEMENT = "cells"; - public static final String CELL_ELEMENT = "cell"; - public static final String CELL_NAME_ELEMENT = "name"; - - public static final String METRICS_ELEMENT = "metrics"; - public static final String METRIC_ELEMENT = "metric"; - public static final String METRIC_NAME_ELEMENT = "name"; - public static final String METRIC_PLUGIN_ELEMENT = "plugin"; - - /* service.xml tags */ - public static final String SERVICE_REMOTE_ELEMENT = "service.remote"; - - /* plugins.xml tags */ - public final static String PLUGIN_ELEMENT = "plugin"; - - public final static String PLUGIN_ID_ELEMENT = "id"; - public final static String PLUGIN_CLASS_ELEMENT = "class"; - public final static String PLUGIN_PROPERTIES_ELEMENT = "properties"; - - /* project.xml files tags */ - public static final String JIRA_SERVICE_PROPERTY = "jira-service"; - public static final String JIRA_ADRESS_TAG = "jira-address"; - public static final String SVN_SERVICE_PROPERTY = "svn-service"; - - public static final String CC_SERVICE_PROPERTY = "cc-service"; - public static final String CC_ADRESS_TAG = "cc-address"; - - public static final String SVN_REPO_ADRESS_TAG = "svn-repo"; - public static final String SVN_USERNAME_TAG = "svn-username"; - public static final String SVN_PASSWD_TAG = "svn-passwd"; - - /** - * This class cannot be instatiated. - */ - private Tags() {}; -} \ No newline at end of file Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-06-08 00:22:36 UTC (rev 4658) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-06-08 00:34:35 UTC (rev 4659) @@ -1,121 +0,0 @@ -package org.jboss.forge.status.tools; - -import java.util.HashSet; -import java.util.Set; - -import org.jboss.forge.common.ForgeHelper; -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.PermissionsChecker; -import org.jboss.forge.status.StatusDescriptor; -import org.jboss.forge.status.StatusConfWatcher; - -import org.jboss.shotoku.aop.CacheItem; - -/** - * Common constants and functions. - * @author Pawel Wrzeszcz - */ -public class Tools { - - /** <code>STATUS_XML<code> - file defining the list of watched feeds */ - private final static String STATUS_XML = "status.xml"; - private final static String STATUS_PLUGINS_XML = "plugins.xml"; - private final static String STATUS_SERVICE_PROPERTIES = "service.properties"; - - /** <code>STATUS_DIR</code> - directory in which file <code>STATUS_XML<code> is stored. */ - private final static String STATUS_DIR = "status"; - - private final static String STATUS_JSP = "status.jsp"; - private final static String STATUS_JSP_DIR = "status"; - private final static String PROJECT_DETAILS_JSP = "project_details.jsp"; - private final static String COLUMN_DETAILS_JSP = "column_details.jsp"; - - /** Shotoku directory to store historical scores */ - private static final String SHOTOKU_STATUS_DIR = "status"; - - public static final String STATUS_SERVICE_NAME = "status:service=scores"; - public static final String STATUS_LOCAL_SERVICE = "Status/LocalScoresService"; - public static final String STATUS_REMOTE_SERVICE = "Status/RemoteScoresService"; - - @CacheItem - private static StatusConfWatcher conf; - - public static synchronized StatusDescriptor getDesc(final String portalName) { - return conf.get(portalName); - } - - /** - * Path to the xml file with the Status Matrix properties. - */ - public static String getXmlCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_XML; - } - - /** - * Path to the xml file defining Plugins used in the Matrix. - */ - public static String getXmlStatusPluginsCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_PLUGINS_XML; - } - - /** - * Path to the xml file defining ejb3 service. - */ - public static String getServicePropertiesCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_SERVICE_PROPERTIES; - } - - /** - * Path to the projects.xml file. - */ - public static String getProjectsXmlPath(String portalName) { - return portalName + "/" + ProjectsHelper.PROJECTS_DESC; - } - - /** - * Set containing paths to project.xml files for all projects. - */ - public static Set<String> getProjectXmlPathsSet(String portalName) { - - Set<String> pathsSet = new HashSet<String>(); - - Projects projects = ProjectsHelper.getProjects(portalName); - Set<String> projectIdsSet = projects.getProjectIds( - (PermissionsChecker) new NullPermissionsChecker(), null); - - for (String projectId : projectIdsSet) { - - String projectXmlPath = portalName + "/" + ProjectsHelper.MEMBERS_DIR - + "/" + projectId + "/" + ProjectsHelper.PROJECT_DESC; - pathsSet.add(projectXmlPath); - } - return pathsSet; - } - - /** - * Path to the jsp file responsible file displaying the Status Matrix. - */ - public static String getJspCmPath() { - return STATUS_JSP_DIR + "/" + STATUS_JSP; - } - - /** - * Path to the jsp file responsible for displaying project details. - */ - public static String getPrjDetailsJspCmPath() { - return STATUS_JSP_DIR + "/" + PROJECT_DETAILS_JSP; - } - - /** - * Path to the jsp file responsible displaying column details. - */ - public static String getColumnDetailsJspCmPath() { - return STATUS_JSP_DIR + "/" + COLUMN_DETAILS_JSP; - } - - public static String getShotokuStatusPath(String portalName) { - return ForgeHelper.DYNAMIC_CONTENT_DIR + "/" + SHOTOKU_STATUS_DIR; - } -} |
|
From: <jbo...@li...> - 2006-06-08 00:22:44
|
Author: dam...@jb...
Date: 2006-06-07 20:22:36 -0400 (Wed, 07 Jun 2006)
New Revision: 4658
Added:
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
Removed:
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Modified:
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java
Log:
MERGED: reverse merge to undo: svn merge -r 4657:4656 .
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -35,7 +35,6 @@
import org.jboss.forge.common.XmlTools;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException;
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
@@ -48,7 +47,8 @@
import org.jboss.forge.status.templates.Columns;
import org.jboss.forge.status.templates.MatrixTemplate;
import org.jboss.forge.status.tools.ScoresManagerSync;
-import org.jboss.forge.status.tools.ScoresManager;
+import org.jboss.forge.status.tools.ScoresManagerAsync;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import org.jboss.portal.common.context.DelegateContext;
@@ -92,12 +92,12 @@
PluginsValues pluginsValues;
try {
- // Get current scores
+ // Compute and save current scores
- ScoresManager.init(portalName, serviceConf);
- ScoresManager.save(projects, pluginsConf);
+ ScoresManagerAsync.init(portalName, serviceConf);
+ ScoresManagerAsync.save(projects, pluginsConf);
- pluginsValues = ScoresManager.getCurrentScores();
+ pluginsValues = ScoresManagerAsync.getCurrentScores();
} catch (ScoresSaveException e) {
log.error("Saving scores failed ", e);
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -24,7 +24,7 @@
import java.util.Map;
import java.util.Set;
-import org.jboss.forge.status.common.Locations;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.shotoku.cache.ChangeType;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
@@ -40,16 +40,16 @@
String portalName = key;
- addWatchedPath(key, Locations.getXmlCmPath(portalName));
- addWatchedPath(key, Locations.getXmlStatusPluginsCmPath(portalName));
- addWatchedPath(key, Locations.getServicePropertiesCmPath(portalName));
+ addWatchedPath(key, Tools.getXmlCmPath(portalName));
+ addWatchedPath(key, Tools.getXmlStatusPluginsCmPath(portalName));
+ addWatchedPath(key, Tools.getServicePropertiesCmPath(portalName));
/* Watch projects.xml file */
- addWatchedPath(key, Locations.getProjectsXmlPath(portalName));
+ addWatchedPath(key, Tools.getProjectsXmlPath(portalName));
/* Watch all project.xml files.
* We assume that they contain entries used by plugins */
- Set<String> projectXmlPathsSet = Locations.getProjectXmlPathsSet(portalName);
+ Set<String> projectXmlPathsSet = Tools.getProjectXmlPathsSet(portalName);
for (String projectXmlPath : projectXmlPathsSet) {
addWatchedPath(key, projectXmlPath);
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -25,7 +25,7 @@
import java.util.Map;
import java.io.IOException;
-import org.jboss.forge.status.common.Locations;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.portal.common.context.DelegateContext;
import org.jboss.shotoku.ContentManager;
@@ -53,13 +53,13 @@
public StatusDescriptor(String portalName, ContentManager cm) {
try {
- String statusPath = Locations.getXmlCmPath(portalName);
+ String statusPath = Tools.getXmlCmPath(portalName);
Node statusRoot = getRoot(cm , statusPath);
- String pluginsPath = Locations.getXmlStatusPluginsCmPath(portalName);
+ String pluginsPath = Tools.getXmlStatusPluginsCmPath(portalName);
Node pluginsRoot = getRoot(cm, pluginsPath);
- String servicePath = Locations.getServicePropertiesCmPath(portalName);
+ String servicePath = Tools.getServicePropertiesCmPath(portalName);
org.jboss.shotoku.Node serviceNode = cm.getNode(servicePath);
status = new Status(portalName, statusRoot, pluginsRoot,
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -28,9 +28,7 @@
import javax.portlet.PortletRequestDispatcher;
import org.jboss.forge.common.ForgeHelper;
-import org.jboss.forge.status.common.Locations;
-import org.jboss.forge.status.common.Tools;
-
+import org.jboss.forge.status.tools.Tools;
import org.jboss.portal.common.context.DelegateContext;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
@@ -64,17 +62,17 @@
DelegateContext context = null;
if ((id != null) && (action.equals(PROJECT_DETAILS_ACTION))) {
- jspPath = Locations.getPrjDetailsJspCmPath();
+ jspPath = Tools.getPrjDetailsJspCmPath();
context = desc.getProjectContext(id);
}
if ((id != null) && (action.equals(COLUMN_DETAILS_ACTION))) {
- jspPath = Locations.getColumnDetailsJspCmPath();
+ jspPath = Tools.getColumnDetailsJspCmPath();
context = desc.getColumnContext(id);
}
if (id == null) { // Request for main Matrix page
- jspPath = Locations.getJspCmPath();
+ jspPath = Tools.getJspCmPath();
context = desc.getContext();
}
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -25,8 +25,8 @@
import java.util.List;
import java.net.MalformedURLException;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.plugins.KosmosStatusPlugin;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import com.caucho.hessian.client.HessianProxyFactory;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -25,8 +25,8 @@
import java.util.Map;
import java.util.HashMap;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.plugins.Plugin;
+import org.jboss.forge.status.tools.Tags;
/**
* @author Pawel Wrzeszcz
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -25,8 +25,8 @@
import java.util.List;
import java.net.MalformedURLException;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.plugins.KosmosStatusPlugin;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import com.caucho.hessian.client.HessianProxyFactory;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -25,8 +25,8 @@
import java.util.List;
import java.net.MalformedURLException;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.plugins.KosmosStatusPlugin;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.logging.Logger;
import com.caucho.hessian.client.HessianProxyFactory;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -29,6 +29,7 @@
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.protocol.PluginConf;
+import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
/**
@@ -36,11 +37,12 @@
*/
public interface ScoresService {
+ public PluginsValues getPluginsValues(String portalName,
+ Date date) throws GetScoresException;
+
public void save(Projects projects, List<PluginConf> pluginsConf,
- String portalName) throws ScoresSaveException;
-
- public PluginsValues getPluginsValues(String portalName, Date date)
- throws GetScoresException;
-
- public boolean hasPluginsValues(String portalName, Date date);
+ String portalName) throws ScoresSaveException;
+
+ public PluginValues get(String portalName, String pluginId, Date date)
+ throws GetScoresException;
}
\ No newline at end of file
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -35,7 +35,6 @@
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Constants;
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.protocol.GetScoresRequest;
@@ -57,7 +56,7 @@
@ActivationConfigProperty(propertyName="destinationType",
propertyValue="javax.jms.Queue"),
@ActivationConfigProperty(propertyName="destination",
- propertyValue=Constants.QUEUE_NAME)
+ propertyValue="queue/jmm")
})
public class ScoresMDB implements MessageListener {
@@ -69,17 +68,16 @@
ObjectMessage message = (ObjectMessage) msg;
try {
- String requestName =
- message.getStringProperty(Constants.NAME_PROPERTY);
+ String requestName = message.getStringProperty("name");
System.out.println("request name: " + requestName);
- if (requestName.equals(Constants.SAVE_MESSAGE)) {
+ if (requestName.equals("save")) {
SaveRequest saveRequest = (SaveRequest) message.getObject();
handleRequest(saveRequest);
}
- if (requestName.equals(Constants.GET_SCORES_MESSAGE)) {
+ if (requestName.equals("getPluginsValues")) {
GetScoresRequest getScoresRequest =
(GetScoresRequest) message.getObject();
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -43,17 +43,16 @@
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Constants;
-import org.jboss.forge.status.common.Locations;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.ScoresService;
import org.jboss.forge.status.service.ScoresServiceLocal;
import org.jboss.forge.status.service.ScoresServiceRemote;
+import org.jboss.forge.status.service.impl.protocol.PluginValuesImpl;
import org.jboss.forge.status.service.impl.protocol.PluginsValuesImpl;
import org.jboss.forge.status.service.protocol.PluginConf;
import org.jboss.forge.status.tools.Plugins;
+import org.jboss.forge.status.tools.Tools;
import org.jboss.logging.Logger;
import org.jboss.shotoku.ContentManager;
@@ -67,12 +66,12 @@
* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
*/
-@Service(objectName=Tags.STATUS_SERVICE_NAME)
+@Service(objectName=Tools.STATUS_SERVICE_NAME)
@Management(ScoresService.class)
@Local(ScoresServiceLocal.class)
-@LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE)
+@LocalBinding(jndiBinding=Tools.STATUS_LOCAL_SERVICE)
@Remote(ScoresServiceRemote.class)
-@RemoteBinding(jndiBinding=Constants.STATUS_REMOTE_SERVICE)
+@RemoteBinding(jndiBinding=Tools.STATUS_REMOTE_SERVICE)
public class ScoresServiceImpl implements ScoresService {
private static Logger log = Logger.getLogger(ScoresServiceImpl.class);
@@ -100,7 +99,7 @@
// Get directory where we store historical scores
Directory rootDir = cm.getRootDirectory();
- String dirName = Locations.getShotokuStatusPath(portalName);
+ String dirName = Tools.getShotokuStatusPath(portalName);
Directory dir = getDir(rootDir, dirName);
log.info("Computing scores...");
@@ -182,7 +181,7 @@
Directory dir;
try {
- dir = rootDir.getDirectory(Locations.getShotokuStatusPath(portalName));
+ dir = rootDir.getDirectory(Tools.getShotokuStatusPath(portalName));
} catch (RepositoryException e) {
throw new GetScoresException(e);
} catch (ResourceDoesNotExist e) {
@@ -342,16 +341,11 @@
return getNodeName(today);
}
- public boolean hasPluginsValues(String portalName, Date date) {
+ public PluginValuesImpl get(String portalName, String pluginId, Date date)
+ throws GetScoresException {
- PluginsValuesImpl pluginsValues = null;
-
- try {
- pluginsValues = getPluginsValues(portalName, date);
- } catch (GetScoresException e) {
- return false;
- }
-
- return (pluginsValues != null);
- }
+ PluginsValuesImpl pv = getPluginsValues(portalName, date);
+ return pv.getPluginValues(pluginId);
+ }
+
}
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -27,9 +27,9 @@
import java.util.Properties;
import org.jboss.forge.common.XmlTools;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException;
import org.jboss.forge.status.service.protocol.PluginConf;
+import org.jboss.forge.status.tools.Tags;
import org.w3c.dom.Node;
/**
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -24,8 +24,8 @@
import java.util.Properties;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.ServiceConf;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.shotoku.Node;
/**
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -26,8 +26,8 @@
import java.util.List;
import org.jboss.forge.common.XmlTools;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -34,11 +34,11 @@
import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
import org.jboss.forge.status.tools.ProjectsByNameComparator;
import org.jboss.forge.status.tools.ProjectsByScoreComparator;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -27,8 +27,8 @@
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -22,9 +22,9 @@
package org.jboss.forge.status.templates;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.forge.common.XmlTools;
import org.jboss.portal.common.context.DelegateContext;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -26,8 +26,8 @@
import java.util.ArrayList;
import org.jboss.forge.common.XmlTools;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tags;
import org.jboss.portal.common.context.DelegateContext;
import org.w3c.dom.Node;
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -31,7 +31,6 @@
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Tags;
import org.jboss.forge.status.exceptions.InvalidPluginPropertiesException;
import org.jboss.forge.status.plugins.Plugin;
import org.jboss.forge.status.service.protocol.PluginConf;
Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -1,183 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.forge.status.tools;
-
-import java.io.Serializable;
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.exceptions.GetScoresException;
-import org.jboss.forge.status.exceptions.ScoresSaveException;
-import org.jboss.forge.status.service.impl.protocol.GetScoresRequestImpl;
-import org.jboss.forge.status.service.impl.protocol.SaveRequestImpl;
-import org.jboss.forge.status.service.protocol.GetScoresRequest;
-import org.jboss.forge.status.service.protocol.PluginConf;
-import org.jboss.forge.status.service.protocol.PluginsValues;
-import org.jboss.forge.status.service.protocol.SaveRequest;
-import org.jboss.forge.status.service.protocol.ServiceConf;
-import org.jboss.forge.status.common.Constants;
-
-/**
-* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
-*/
-
-public class ScoresManager {
-
- private static boolean isRemote;
- private static Properties properties;
-
- public static void init(String portalName, ServiceConf serviceConf) {
-
- ScoresManagerSync.init(portalName, serviceConf); //TODO inheritance
-
- isRemote = serviceConf.isRemote();
- System.out.println("remote: " + isRemote);
-
- properties = serviceConf.getProperties();
- }
-
- public static void save(Projects projects, List<PluginConf> pluginsConf)
- throws ScoresSaveException {
-
- SaveRequest saveRequest = new SaveRequestImpl(pluginsConf, projects);
- //TODO request factory
- //conf factory?
-
- // Send message
- try {
- sendMessage(Constants.SAVE_MESSAGE, saveRequest);
- } catch (Exception e) {
- throw new ScoresSaveException(e);
- }
- }
-
- public static PluginsValues getScores(Date date, Date toDate)
- throws GetScoresException {
- //TODO toDate
-
- Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-
- GetScoresRequest getScoresRequest =
- new GetScoresRequestImpl(date, toDate, timestamp);
-
- // Send message
- try {
- sendMessage(Constants.GET_SCORES_MESSAGE, getScoresRequest);
- } catch (Exception e) {
- throw new GetScoresException(e);
- }
-
- PluginsValues pluginsValues = null;
- int attempts = 0;
-
- for (;;) {
-
- pluginsValues = RecordManager.get(timestamp);
-
- System.out.println("attempt: " + pluginsValues);
-
- if ((pluginsValues != null) ||
- ((attempts++) == Constants.MAX_ATTEMPTS)) {
- break;
- }
-
- try {
- Thread.sleep(Constants.SLEEP_TIME);
- } catch (InterruptedException e) {
- throw new GetScoresException(e);
- }
- }
-
- return pluginsValues;
- }
-
- /**
- * For the specified plugin returns historical project score
- * from the given <code>date</code> in the past.
- * If scores from specified day are not available,
- * the next available scores saved at the day before or equal
- * to <code>toDate</code> are returned.
- *
- * Notice that only year, month and day matter in passed dates.
- *
- * @return project score from the given date for specified plugin
- * @throws GetScoresException
- */
- public static long getValue(String pluginId, String projectId,
- Date date, Date toDate)
- throws GetScoresException {
-
- PluginsValues pluginsValues = getScores(date, toDate);
-
- return pluginsValues.getPluginValue(pluginId, projectId);
- }
-
- public static PluginsValues getCurrentScores()
- throws GetScoresException {
-
- Date now = new Date();
-
- return getScores(now, now);
- }
-
- private static void sendMessage(String name, Serializable request) throws
- NamingException, JMSException {
-
- Queue queue = null;
- QueueConnection connection = null;
- QueueSession session = null;
- QueueSender sender = null;
- Context context = new InitialContext(properties);
-
- queue = (Queue) context.lookup(Constants.QUEUE_NAME);
- QueueConnectionFactory factory =
- (QueueConnectionFactory) context.lookup("ConnectionFactory");
- connection = factory.createQueueConnection();
- session = connection.createQueueSession(false,
- QueueSession.AUTO_ACKNOWLEDGE);
-
- // Create message
- ObjectMessage message = session.createObjectMessage();
- message.setStringProperty("name", name);
- message.setObject(request);
-
- sender = session.createSender(queue);
- sender.send(message);
- session.close ();
- }
-
-}
Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java (from rev 4656, labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java)
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-08 00:21:23 UTC (rev 4657)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-08 00:22:36 UTC (rev 4658)
@@ -32,7 +32,6 @@
import javax.rmi.PortableRemoteObject;
import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Constants;
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.ScoresService;
@@ -130,8 +129,8 @@
// Perform look up using JNDI name of ejb object
String serviceBinding =
- (isRemote ? Constants.STATUS_REMOTE_SERVICE :
- Constants.STATUS_LOCAL_SERVICE);
+ (isRemote ? Tools.STATUS_REMOTE_SERVICE :
+ Tools.STATUS_LOCAL_SERVICE);
Object ref = context.lookup(serviceBinding);
// Narrow the reference of the object returned by lookup() method
Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java (from rev 4656, labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java)
Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java (from rev 4656, labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java)
|
|
From: <jbo...@li...> - 2006-06-08 00:21:29
|
Author: dam...@jb... Date: 2006-06-07 20:21:23 -0400 (Wed, 07 Jun 2006) New Revision: 4657 Added: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java Removed: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java Log: MERGED: -r 4289:4290 https://svn.labs.jboss.com/labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status because I'm losing my mind. Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -35,6 +35,7 @@ import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; @@ -47,8 +48,7 @@ import org.jboss.forge.status.templates.Columns; import org.jboss.forge.status.templates.MatrixTemplate; import org.jboss.forge.status.tools.ScoresManagerSync; -import org.jboss.forge.status.tools.ScoresManagerAsync; -import org.jboss.forge.status.tools.Tags; +import org.jboss.forge.status.tools.ScoresManager; import org.jboss.logging.Logger; import org.jboss.portal.common.context.DelegateContext; @@ -92,12 +92,12 @@ PluginsValues pluginsValues; try { - // Compute and save current scores + // Get current scores - ScoresManagerAsync.init(portalName, serviceConf); - ScoresManagerAsync.save(projects, pluginsConf); + ScoresManager.init(portalName, serviceConf); + ScoresManager.save(projects, pluginsConf); - pluginsValues = ScoresManagerAsync.getCurrentScores(); + pluginsValues = ScoresManager.getCurrentScores(); } catch (ScoresSaveException e) { log.error("Saving scores failed ", e); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; -import org.jboss.forge.status.tools.Tools; +import org.jboss.forge.status.common.Locations; import org.jboss.shotoku.cache.ChangeType; import org.jboss.shotoku.cache.ShotokuResourceWatcher; @@ -40,16 +40,16 @@ String portalName = key; - addWatchedPath(key, Tools.getXmlCmPath(portalName)); - addWatchedPath(key, Tools.getXmlStatusPluginsCmPath(portalName)); - addWatchedPath(key, Tools.getServicePropertiesCmPath(portalName)); + addWatchedPath(key, Locations.getXmlCmPath(portalName)); + addWatchedPath(key, Locations.getXmlStatusPluginsCmPath(portalName)); + addWatchedPath(key, Locations.getServicePropertiesCmPath(portalName)); /* Watch projects.xml file */ - addWatchedPath(key, Tools.getProjectsXmlPath(portalName)); + addWatchedPath(key, Locations.getProjectsXmlPath(portalName)); /* Watch all project.xml files. * We assume that they contain entries used by plugins */ - Set<String> projectXmlPathsSet = Tools.getProjectXmlPathsSet(portalName); + Set<String> projectXmlPathsSet = Locations.getProjectXmlPathsSet(portalName); for (String projectXmlPath : projectXmlPathsSet) { addWatchedPath(key, projectXmlPath); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -25,7 +25,7 @@ import java.util.Map; import java.io.IOException; -import org.jboss.forge.status.tools.Tools; +import org.jboss.forge.status.common.Locations; import org.jboss.portal.common.context.DelegateContext; import org.jboss.shotoku.ContentManager; @@ -53,13 +53,13 @@ public StatusDescriptor(String portalName, ContentManager cm) { try { - String statusPath = Tools.getXmlCmPath(portalName); + String statusPath = Locations.getXmlCmPath(portalName); Node statusRoot = getRoot(cm , statusPath); - String pluginsPath = Tools.getXmlStatusPluginsCmPath(portalName); + String pluginsPath = Locations.getXmlStatusPluginsCmPath(portalName); Node pluginsRoot = getRoot(cm, pluginsPath); - String servicePath = Tools.getServicePropertiesCmPath(portalName); + String servicePath = Locations.getServicePropertiesCmPath(portalName); org.jboss.shotoku.Node serviceNode = cm.getNode(servicePath); status = new Status(portalName, statusRoot, pluginsRoot, Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -28,7 +28,9 @@ import javax.portlet.PortletRequestDispatcher; import org.jboss.forge.common.ForgeHelper; -import org.jboss.forge.status.tools.Tools; +import org.jboss.forge.status.common.Locations; +import org.jboss.forge.status.common.Tools; + import org.jboss.portal.common.context.DelegateContext; import org.jboss.portal.core.servlet.jsp.PortalJsp; @@ -62,17 +64,17 @@ DelegateContext context = null; if ((id != null) && (action.equals(PROJECT_DETAILS_ACTION))) { - jspPath = Tools.getPrjDetailsJspCmPath(); + jspPath = Locations.getPrjDetailsJspCmPath(); context = desc.getProjectContext(id); } if ((id != null) && (action.equals(COLUMN_DETAILS_ACTION))) { - jspPath = Tools.getColumnDetailsJspCmPath(); + jspPath = Locations.getColumnDetailsJspCmPath(); context = desc.getColumnContext(id); } if (id == null) { // Request for main Matrix page - jspPath = Tools.getJspCmPath(); + jspPath = Locations.getJspCmPath(); context = desc.getContext(); } Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common (from rev 4290, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-05-17 20:54:55 UTC (rev 4290) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -1,28 +0,0 @@ -package org.jboss.forge.status.common; - -/** - * @author Pawel Wrzeszcz - */ -public class Constants { - - - /* The length of time to sleep (in milliseconds) - * if requested scores are not available */ - public static final long SLEEP_TIME = 2000; - public static final int MAX_ATTEMPTS = 10; - - public static final String QUEUE_NAME = "queue/jmm"; - - public static final String NAME_PROPERTY = "name"; - public static final String SAVE_MESSAGE = "save"; - public static final String GET_SCORES_MESSAGE = "get"; - - public static final String STATUS_LOCAL_SERVICE = "Status/LocalScoresService"; - public static final String STATUS_REMOTE_SERVICE = "Status/RemoteScoresService"; - - /** - * This class cannot be instatiated. - */ - private Constants() {}; - -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java (from rev 4290, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java 2006-05-17 20:54:55 UTC (rev 4290) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -1,106 +0,0 @@ -package org.jboss.forge.status.common; - -import java.util.HashSet; -import java.util.Set; - -import org.jboss.forge.common.ForgeHelper; -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.PermissionsChecker; - -/** - * Common functions. - * @author Pawel Wrzeszcz - */ -public class Locations { - - /** <code>STATUS_XML<code> - file defining the list of watched feeds */ - private final static String STATUS_XML = "status.xml"; - private final static String STATUS_PLUGINS_XML = "plugins.xml"; - private final static String STATUS_SERVICE_PROPERTIES = "service.properties"; - - /** <code>STATUS_DIR</code> - directory in which file <code>STATUS_XML<code> is stored. */ - private final static String STATUS_DIR = "status"; - - private final static String STATUS_JSP = "status.jsp"; - private final static String STATUS_JSP_DIR = "status"; - private final static String PROJECT_DETAILS_JSP = "project_details.jsp"; - private final static String COLUMN_DETAILS_JSP = "column_details.jsp"; - - /** Shotoku directory to store historical scores */ - private static final String SHOTOKU_STATUS_DIR = "status"; - - /** - * Path to the xml file with the Status Matrix properties. - */ - public static String getXmlCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_XML; - } - - /** - * Path to the xml file defining Plugins used in the Matrix. - */ - public static String getXmlStatusPluginsCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_PLUGINS_XML; - } - - /** - * Path to the xml file defining ejb3 service. - */ - public static String getServicePropertiesCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + Locations.STATUS_SERVICE_PROPERTIES; - } - - /** - * Path to the projects.xml file. - */ - public static String getProjectsXmlPath(String portalName) { - return portalName + "/" + ProjectsHelper.PROJECTS_DESC; - } - - /** - * Set containing paths to project.xml files for all projects. - */ - public static Set<String> getProjectXmlPathsSet(String portalName) { - - Set<String> pathsSet = new HashSet<String>(); - - Projects projects = ProjectsHelper.getProjects(portalName); - Set<String> projectIdsSet = projects.getProjectIds( - (PermissionsChecker) new NullPermissionsChecker(), null); - - for (String projectId : projectIdsSet) { - - String projectXmlPath = portalName + "/" + ProjectsHelper.MEMBERS_DIR - + "/" + projectId + "/" + ProjectsHelper.PROJECT_DESC; - pathsSet.add(projectXmlPath); - } - return pathsSet; - } - - /** - * Path to the jsp file responsible file displaying the Status Matrix. - */ - public static String getJspCmPath() { - return STATUS_JSP_DIR + "/" + STATUS_JSP; - } - - /** - * Path to the jsp file responsible for displaying project details. - */ - public static String getPrjDetailsJspCmPath() { - return STATUS_JSP_DIR + "/" + PROJECT_DETAILS_JSP; - } - - /** - * Path to the jsp file responsible displaying column details. - */ - public static String getColumnDetailsJspCmPath() { - return STATUS_JSP_DIR + "/" + COLUMN_DETAILS_JSP; - } - - public static String getShotokuStatusPath(String portalName) { - return ForgeHelper.DYNAMIC_CONTENT_DIR + "/" + SHOTOKU_STATUS_DIR; - } -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java (from rev 4290, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java 2006-05-17 20:54:55 UTC (rev 4290) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -1,87 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.forge.status.common; - -/** -* @author Pawel Wrzeszcz -* Status Matrix xml tags. -*/ -public class Tags { - - /* status.xml file tags */ - - /* main page */ - public static final String MAIN_PAGE_COLUMNS_TAG = "main-page"; - - public final static String COLUMN_ELEMENT = "column"; - public final static String COLUMNS_ELEMENT = "columns"; - public static final String COLUMN_NAME_ELEMENT = "name"; - public static final String COLUMN_PLUGIN_ELEMENT = "plugin"; - - public final static String ORDER_PLUGIN_ELEMENT = "order-plugin"; - - /* project page */ - public static final String PROJECT_PAGE_COLUMNS_TAG = "project-page"; - - public static final String ROWS_ELEMENT = "rows"; - public static final String ROW_ELEMENT = "row"; - public static final String ROW_NAME_ELEMENT = "name"; - - public static final String CELLS_ELEMENT = "cells"; - public static final String CELL_ELEMENT = "cell"; - public static final String CELL_NAME_ELEMENT = "name"; - - public static final String METRICS_ELEMENT = "metrics"; - public static final String METRIC_ELEMENT = "metric"; - public static final String METRIC_NAME_ELEMENT = "name"; - public static final String METRIC_PLUGIN_ELEMENT = "plugin"; - - /* service.xml tags */ - public static final String SERVICE_REMOTE_ELEMENT = "service.remote"; - - /* plugins.xml tags */ - public final static String PLUGIN_ELEMENT = "plugin"; - - public final static String PLUGIN_ID_ELEMENT = "id"; - public final static String PLUGIN_CLASS_ELEMENT = "class"; - public final static String PLUGIN_PROPERTIES_ELEMENT = "properties"; - - /* project.xml files tags */ - public static final String JIRA_SERVICE_PROPERTY = "jira-service"; - public static final String JIRA_ADRESS_TAG = "jira-address"; - public static final String SVN_SERVICE_PROPERTY = "svn-service"; - - public static final String CC_SERVICE_PROPERTY = "cc-service"; - public static final String CC_ADRESS_TAG = "cc-address"; - - public static final String SVN_REPO_ADRESS_TAG = "svn-repo"; - public static final String SVN_USERNAME_TAG = "svn-username"; - public static final String SVN_PASSWD_TAG = "svn-passwd"; - - public static final String STATUS_SERVICE_NAME = "status:service=scores"; - - /** - * This class cannot be instatiated. - */ - private Tags() {}; -} \ No newline at end of file Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java (from rev 4290, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java 2006-05-17 20:54:55 UTC (rev 4290) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -1,21 +0,0 @@ -package org.jboss.forge.status.common; - -import org.jboss.forge.status.StatusDescriptor; -import org.jboss.forge.status.StatusConfWatcher; - -import org.jboss.shotoku.aop.CacheItem; - -/** - * Common functions. - * @author Pawel Wrzeszcz - */ -public class Tools { - - @CacheItem - private static StatusConfWatcher conf; - - public static synchronized StatusDescriptor getDesc(final String portalName) { - return conf.get(portalName); - } - -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java (from rev 4290, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -25,8 +25,8 @@ import java.util.List; import java.net.MalformedURLException; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.KosmosStatusPlugin; -import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -25,8 +25,8 @@ import java.util.Map; import java.util.HashMap; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.Plugin; -import org.jboss.forge.status.tools.Tags; /** * @author Pawel Wrzeszcz Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -25,8 +25,8 @@ import java.util.List; import java.net.MalformedURLException; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.KosmosStatusPlugin; -import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -25,8 +25,8 @@ import java.util.List; import java.net.MalformedURLException; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.KosmosStatusPlugin; -import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -29,7 +29,6 @@ import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.protocol.PluginConf; -import org.jboss.forge.status.service.protocol.PluginValues; import org.jboss.forge.status.service.protocol.PluginsValues; /** @@ -37,12 +36,11 @@ */ public interface ScoresService { - public PluginsValues getPluginsValues(String portalName, - Date date) throws GetScoresException; - public void save(Projects projects, List<PluginConf> pluginsConf, - String portalName) throws ScoresSaveException; - - public PluginValues get(String portalName, String pluginId, Date date) - throws GetScoresException; + String portalName) throws ScoresSaveException; + + public PluginsValues getPluginsValues(String portalName, Date date) + throws GetScoresException; + + public boolean hasPluginsValues(String portalName, Date date); } \ No newline at end of file Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -35,6 +35,7 @@ import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Constants; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.protocol.GetScoresRequest; @@ -56,7 +57,7 @@ @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"), @ActivationConfigProperty(propertyName="destination", - propertyValue="queue/jmm") + propertyValue=Constants.QUEUE_NAME) }) public class ScoresMDB implements MessageListener { @@ -68,16 +69,17 @@ ObjectMessage message = (ObjectMessage) msg; try { - String requestName = message.getStringProperty("name"); + String requestName = + message.getStringProperty(Constants.NAME_PROPERTY); System.out.println("request name: " + requestName); - if (requestName.equals("save")) { + if (requestName.equals(Constants.SAVE_MESSAGE)) { SaveRequest saveRequest = (SaveRequest) message.getObject(); handleRequest(saveRequest); } - if (requestName.equals("getPluginsValues")) { + if (requestName.equals(Constants.GET_SCORES_MESSAGE)) { GetScoresRequest getScoresRequest = (GetScoresRequest) message.getObject(); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -43,16 +43,17 @@ import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Constants; +import org.jboss.forge.status.common.Locations; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.ScoresService; import org.jboss.forge.status.service.ScoresServiceLocal; import org.jboss.forge.status.service.ScoresServiceRemote; -import org.jboss.forge.status.service.impl.protocol.PluginValuesImpl; import org.jboss.forge.status.service.impl.protocol.PluginsValuesImpl; import org.jboss.forge.status.service.protocol.PluginConf; import org.jboss.forge.status.tools.Plugins; -import org.jboss.forge.status.tools.Tools; import org.jboss.logging.Logger; import org.jboss.shotoku.ContentManager; @@ -66,12 +67,12 @@ * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) */ -@Service(objectName=Tools.STATUS_SERVICE_NAME) +@Service(objectName=Tags.STATUS_SERVICE_NAME) @Management(ScoresService.class) @Local(ScoresServiceLocal.class) -@LocalBinding(jndiBinding=Tools.STATUS_LOCAL_SERVICE) +@LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE) @Remote(ScoresServiceRemote.class) -@RemoteBinding(jndiBinding=Tools.STATUS_REMOTE_SERVICE) +@RemoteBinding(jndiBinding=Constants.STATUS_REMOTE_SERVICE) public class ScoresServiceImpl implements ScoresService { private static Logger log = Logger.getLogger(ScoresServiceImpl.class); @@ -99,7 +100,7 @@ // Get directory where we store historical scores Directory rootDir = cm.getRootDirectory(); - String dirName = Tools.getShotokuStatusPath(portalName); + String dirName = Locations.getShotokuStatusPath(portalName); Directory dir = getDir(rootDir, dirName); log.info("Computing scores..."); @@ -181,7 +182,7 @@ Directory dir; try { - dir = rootDir.getDirectory(Tools.getShotokuStatusPath(portalName)); + dir = rootDir.getDirectory(Locations.getShotokuStatusPath(portalName)); } catch (RepositoryException e) { throw new GetScoresException(e); } catch (ResourceDoesNotExist e) { @@ -341,11 +342,16 @@ return getNodeName(today); } - public PluginValuesImpl get(String portalName, String pluginId, Date date) - throws GetScoresException { + public boolean hasPluginsValues(String portalName, Date date) { - PluginsValuesImpl pv = getPluginsValues(portalName, date); - return pv.getPluginValues(pluginId); - } - + PluginsValuesImpl pluginsValues = null; + + try { + pluginsValues = getPluginsValues(portalName, date); + } catch (GetScoresException e) { + return false; + } + + return (pluginsValues != null); + } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -27,9 +27,9 @@ import java.util.Properties; import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException; import org.jboss.forge.status.service.protocol.PluginConf; -import org.jboss.forge.status.tools.Tags; import org.w3c.dom.Node; /** Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -24,8 +24,8 @@ import java.util.Properties; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.ServiceConf; -import org.jboss.forge.status.tools.Tags; import org.jboss.shotoku.Node; /** Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -26,8 +26,8 @@ import java.util.List; import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; import org.w3c.dom.Node; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -34,11 +34,11 @@ import org.jboss.forge.common.projects.permissions.NullPermissionsChecker; import org.jboss.forge.common.projects.permissions.PermissionsChecker; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginValues; import org.jboss.forge.status.service.protocol.PluginsValues; import org.jboss.forge.status.tools.ProjectsByNameComparator; import org.jboss.forge.status.tools.ProjectsByScoreComparator; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -27,8 +27,8 @@ import org.jboss.forge.common.XmlTools; import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; import org.w3c.dom.Node; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -22,9 +22,9 @@ package org.jboss.forge.status.templates; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginValues; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.forge.common.XmlTools; import org.jboss.portal.common.context.DelegateContext; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -26,8 +26,8 @@ import java.util.ArrayList; import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; import org.w3c.dom.Node; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -31,6 +31,7 @@ import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.InvalidPluginPropertiesException; import org.jboss.forge.status.plugins.Plugin; import org.jboss.forge.status.service.protocol.PluginConf; Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java (from rev 4290, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -1,185 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.forge.status.tools; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.Date; -import java.util.List; -import java.util.Properties; - -import javax.jms.JMSException; -import javax.jms.ObjectMessage; -import javax.jms.Queue; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.jboss.forge.common.projects.Projects; -import org.jboss.forge.status.exceptions.GetScoresException; -import org.jboss.forge.status.exceptions.ScoresSaveException; -import org.jboss.forge.status.service.impl.protocol.GetScoresRequestImpl; -import org.jboss.forge.status.service.impl.protocol.SaveRequestImpl; -import org.jboss.forge.status.service.protocol.GetScoresRequest; -import org.jboss.forge.status.service.protocol.PluginConf; -import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.service.protocol.SaveRequest; -import org.jboss.forge.status.service.protocol.ServiceConf; - -/** -* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) -*/ - -public class ScoresManagerAsync { - - private static boolean isRemote; - private static Properties properties; - - public static void init(String portalName, ServiceConf serviceConf) { - - ScoresManagerSync.init(portalName, serviceConf); //TODO inheritance - - isRemote = serviceConf.isRemote(); - System.out.println("remote: " + isRemote); - - properties = serviceConf.getProperties(); - } - - public static void save(Projects projects, List<PluginConf> pluginsConf) - throws ScoresSaveException { - - SaveRequest saveRequest = new SaveRequestImpl(pluginsConf, projects); - //TODO request factory - //conf factory? - - // Send message - try { - sendMessage("save", saveRequest); - } catch (Exception e) { - throw new ScoresSaveException(e); - } - - // TODO poll/wait for results - } - - public static PluginsValues getScores(Date date, Date toDate) - throws GetScoresException { - //TODO toDate - - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - - GetScoresRequest getScoresRequest = - new GetScoresRequestImpl(date, toDate, timestamp); - - // Send message - try { - sendMessage("getPluginsValues", getScoresRequest); - } catch (Exception e) { - throw new GetScoresException(e); - } - - // poll/wait for results - - PluginsValues pluginsValues = null; - - for (;;) { //TODO when we give up? - - pluginsValues = RecordManager.get(timestamp); - - System.out.println("attempt: " + pluginsValues); - - if (pluginsValues != null) { - break; - } - - try { - Thread.sleep(2000); //TODO const - } catch (InterruptedException e) { - throw new GetScoresException(e); - } - } - - return pluginsValues; - } - - /** - * For the specified plugin returns historical project score - * from the given <code>date</code> in the past. - * If scores from specified day are not available, - * the next available scores saved at the day before or equal - * to <code>toDate</code> are returned. - * - * Notice that only year, month and day matter in passed dates. - * - * @return project score from the given date for specified plugin - * @throws GetScoresException - */ - public static long getValue(String pluginId, String projectId, - Date date, Date toDate) - throws GetScoresException { - - PluginsValues pluginsValues = getScores(date, toDate); - - return pluginsValues.getPluginValue(pluginId, projectId); - } - - public static PluginsValues getCurrentScores() - throws GetScoresException { - - Date now = new Date(); - - return getScores(now, now); - } - - private static void sendMessage(String name, Serializable request) throws - NamingException, JMSException { - - Queue queue = null; - QueueConnection connection = null; - QueueSession session = null; - QueueSender sender = null; - Context context = new InitialContext(properties); - - queue = (Queue) context.lookup("queue/jmm"); //TODO const - QueueConnectionFactory factory = - (QueueConnectionFactory) context.lookup("ConnectionFactory"); - connection = factory.createQueueConnection(); - session = connection.createQueueSession(false, - QueueSession.AUTO_ACKNOWLEDGE); - - // Create message - ObjectMessage message = session.createObjectMessage(); - message.setStringProperty("name", name); - message.setObject(request); - - sender = session.createSender(queue); - sender.send(message); - // sess.commit (); TODO closing vs committing - session.close (); - } - -} Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -32,6 +32,7 @@ import javax.rmi.PortableRemoteObject; import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Constants; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.ScoresService; @@ -129,8 +130,8 @@ // Perform look up using JNDI name of ejb object String serviceBinding = - (isRemote ? Tools.STATUS_REMOTE_SERVICE : - Tools.STATUS_LOCAL_SERVICE); + (isRemote ? Constants.STATUS_REMOTE_SERVICE : + Constants.STATUS_LOCAL_SERVICE); Object ref = context.lookup(serviceBinding); // Narrow the reference of the object returned by lookup() method Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -1,85 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.forge.status.tools; - -/** -* @author Pawel Wrzeszcz -* Status Matrix xml tags. -*/ -public class Tags { - - /* status.xml file tags */ - - /* main page */ - public static final String MAIN_PAGE_COLUMNS_TAG = "main-page"; - - public final static String COLUMN_ELEMENT = "column"; - public final static String COLUMNS_ELEMENT = "columns"; - public static final String COLUMN_NAME_ELEMENT = "name"; - public static final String COLUMN_PLUGIN_ELEMENT = "plugin"; - - public final static String ORDER_PLUGIN_ELEMENT = "order-plugin"; - - /* project page */ - public static final String PROJECT_PAGE_COLUMNS_TAG = "project-page"; - - public static final String ROWS_ELEMENT = "rows"; - public static final String ROW_ELEMENT = "row"; - public static final String ROW_NAME_ELEMENT = "name"; - - public static final String CELLS_ELEMENT = "cells"; - public static final String CELL_ELEMENT = "cell"; - public static final String CELL_NAME_ELEMENT = "name"; - - public static final String METRICS_ELEMENT = "metrics"; - public static final String METRIC_ELEMENT = "metric"; - public static final String METRIC_NAME_ELEMENT = "name"; - public static final String METRIC_PLUGIN_ELEMENT = "plugin"; - - /* service.xml tags */ - public static final String SERVICE_REMOTE_ELEMENT = "service.remote"; - - /* plugins.xml tags */ - public final static String PLUGIN_ELEMENT = "plugin"; - - public final static String PLUGIN_ID_ELEMENT = "id"; - public final static String PLUGIN_CLASS_ELEMENT = "class"; - public final static String PLUGIN_PROPERTIES_ELEMENT = "properties"; - - /* project.xml files tags */ - public static final String JIRA_SERVICE_PROPERTY = "jira-service"; - public static final String JIRA_ADRESS_TAG = "jira-address"; - public static final String SVN_SERVICE_PROPERTY = "svn-service"; - - public static final String CC_SERVICE_PROPERTY = "cc-service"; - public static final String CC_ADRESS_TAG = "cc-address"; - - public static final String SVN_REPO_ADRESS_TAG = "svn-repo"; - public static final String SVN_USERNAME_TAG = "svn-username"; - public static final String SVN_PASSWD_TAG = "svn-passwd"; - - /** - * This class cannot be instatiated. - */ - private Tags() {}; -} \ No newline at end of file Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-06-07 23:56:38 UTC (rev 4656) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-06-08 00:21:23 UTC (rev 4657) @@ -1,121 +0,0 @@ -package org.jboss.forge.status.tools; - -import java.util.HashSet; -import java.util.Set; - -import org.jboss.forge.common.ForgeHelper; -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.PermissionsChecker; -import org.jboss.forge.status.StatusDescriptor; -import org.jboss.forge.status.StatusConfWatcher; - -import org.jboss.shotoku.aop.CacheItem; - -/** - * Common constants and functions. - * @author Pawel Wrzeszcz - */ -public class Tools { - - /** <code>STATUS_XML<code> - file defining the list of watched feeds */ - private final static String STATUS_XML = "status.xml"; - private final static String STATUS_PLUGINS_XML = "plugins.xml"; - private final static String STATUS_SERVICE_PROPERTIES = "service.properties"; - - /** <code>STATUS_DIR</code> - directory in which file <code>STATUS_XML<code> is stored. */ - private final static String STATUS_DIR = "status"; - - private final static String STATUS_JSP = "status.jsp"; - private final static String STATUS_JSP_DIR = "status"; - private final static String PROJECT_DETAILS_JSP = "project_details.jsp"; - private final static String COLUMN_DETAILS_JSP = "column_details.jsp"; - - /** Shotoku directory to store historical scores */ - private static final String SHOTOKU_STATUS_DIR = "status"; - - public static final String STATUS_SERVICE_NAME = "status:service=scores"; - public static final String STATUS_LOCAL_SERVICE = "Status/LocalScoresService"; - public static final String STATUS_REMOTE_SERVICE = "Status/RemoteScoresService"; - - @CacheItem - private static StatusConfWatcher conf; - - public static synchronized StatusDescriptor getDesc(final String portalName) { - return conf.get(portalName); - } - - /** - * Path to the xml file with the Status Matrix properties. - */ - public static String getXmlCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_XML; - } - - /** - * Path to the xml file defining Plugins used in the Matrix. - */ - public static String getXmlStatusPluginsCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_PLUGINS_XML; - } - - /** - * Path to the xml file defining ejb3 service. - */ - public static String getServicePropertiesCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_SERVICE_PROPERTIES; - } - - /** - * Path to the projects.xml file. - */ - public static String getProjectsXmlPath(String portalName) { - return portalName + "/" + ProjectsHelper.PROJECTS_DESC; - } - - /** - * Set containing paths to project.xml files for all projects. - */ - public static Set<String> getProjectXmlPathsSet(String portalName) { - - Set<String> pathsSet = new HashSet<String>(); - - Projects projects = ProjectsHelper.getProjects(portalName); - Set<String> projectIdsSet = projects.getProjectIds( - (PermissionsChecker) new NullPermissionsChecker(), null); - - for (String projectId : projectIdsSet) { - - String projectXmlPath = portalName + "/" + ProjectsHelper.MEMBERS_DIR - + "/" + projectId + "/" + ProjectsHelper.PROJECT_DESC; - pathsSet.add(projectXmlPath); - } - return pathsSet; - } - - /** - * Path to the jsp file responsible file displaying the Status Matrix. - */ - public static String getJspCmPath() { - return STATUS_JSP_DIR + "/" + STATUS_JSP; - } - - /** - * Path to the jsp file responsible for displaying project details. - */ - public static String getPrjDetailsJspCmPath() { - return STATUS_JSP_DIR + "/" + PROJECT_DETAILS_JSP; - } - - /** - * Path to the jsp file responsible displaying column details. - */ - public static String getColumnDetailsJspCmPath() { - return STATUS_JSP_DIR + "/" + COLUMN_DETAILS_JSP; - } - - public static String getShotokuStatusPath(String portalName) { - return ForgeHelper.DYNAMIC_CONTENT_DIR + "/" + SHOTOKU_STATUS_DIR; - } -} |
|
From: <jbo...@li...> - 2006-06-07 21:28:28
|
Author: szimano
Date: 2006-06-07 17:28:18 -0400 (Wed, 07 Jun 2006)
New Revision: 4655
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java
labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
three columns
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml 2006-06-07 21:24:29 UTC (rev 4654)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml 2006-06-07 21:28:18 UTC (rev 4655)
@@ -36,5 +36,11 @@
<version>1.0</version>
<jar>gwt-dev-linux.jar</jar>
</dependency>
+ <dependency>
+ <groupId>shotoku</groupId>
+ <artifactId>shotoku-tags</artifactId>
+ <version>1.0</version>
+ <jar>shotoku-tags.jar</jar>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-07 21:24:29 UTC (rev 4654)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-07 21:28:18 UTC (rev 4655)
@@ -44,7 +44,7 @@
private String path;
- private String user;
+ private String currentUser;
private String clas;
@@ -54,7 +54,7 @@
public TagMeShowPopupListener(String path, String user, String clas) {
this.path = path;
- this.user = user;
+ this.currentUser = user;
this.clas = clas;
}
@@ -93,8 +93,18 @@
int curRow = ((Integer) rows.get(user)).intValue();
- table.setText(curRow, table.getCellCount(curRow), tag);
-
+ if (table.getText(curRow, 0).equals(currentUser)) {
+ // current user - add delete button
+ VerticalPanel vpanel = new VerticalPanel();
+ vpanel.add(new Label(tag));
+ vpanel.add(new Button());
+
+ table.setWidget(curRow, table.getCellCount(curRow), vpanel);
+ }
+ else {
+ //just show tag
+ table.setText(curRow, table.getCellCount(curRow), tag);
+ }
}
}
@@ -131,7 +141,7 @@
final DialogBox dialog = new DialogBox();
HorizontalPanel btnPanel = new HorizontalPanel();
- btnPanel.add(new Button("Save", new TagMeClickListener(path, user,
+ btnPanel.add(new Button("Save", new TagMeClickListener(path, currentUser,
clas, textBoxes, info, this)));
btnPanel.add(new Button("Close", new ClickListener() {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-07 21:24:29 UTC (rev 4654)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-07 21:28:18 UTC (rev 4655)
@@ -21,6 +21,7 @@
*/
package org.jboss.labs.tagme.services;
+import java.util.Iterator;
import java.util.Map;
import java.util.Vector;
@@ -106,4 +107,37 @@
}
+ public void deleteTag(String user, String path, String tag) {
+ try {
+ Node node = ContentManager.getContentManager().getNode(path);
+
+ Iterator it = node.getProperties().keySet().iterator();
+ boolean found = false;
+ String key = null;
+
+ while(!found && it.hasNext()) {
+ key = (String)it.next();
+ if (node.getProperties().get(key).equals(tag)) {
+ found = true;
+ }
+ }
+
+ if (found) {
+ node.getProperties().remove(key);
+ try {
+ node.save("Removing tag: "+tag+" by user: "+user);
+ } catch (SaveException e) {
+ e.printStackTrace();
+ }
+ }
+
+ } catch (RepositoryException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (ResourceDoesNotExist e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-06-07 21:24:29 UTC (rev 4654)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-06-07 21:28:18 UTC (rev 4655)
@@ -26,6 +26,7 @@
public interface TagMeTagger {
public Vector getTags(String path);
-
public void addTag(String user, String path, String tag);
+
+ public void deleteTag(String user, String path, String tag);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-07 21:24:29 UTC (rev 4654)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-07 21:28:18 UTC (rev 4655)
@@ -1 +1,2 @@
-<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
<html xmlns="http://www.w3.org/1999/xhtml">
<!--
JBoss, the OpenSource J2EE webOS
Distributable under LGPL license.
See terms of license at gnu.org.
-->
<head><title>JBoss.ORG</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="gwt:module" content="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/org.jboss.labs.tagme.gwt.TagMe" />
<link rel="stylesheet" href="/file-access/default/theme/css/print.css" type="text/css" media="print" />
<link rel="stylesheet" href="/file-access/default/theme/css/common.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge-forums.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/portlet.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/podcasts.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/primates.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/blog.css" type="text/css" media="all" />
<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default -->
<!-- <p:theme themeName='jboss-forge' /> -->
<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqCfg.js'></script>
<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqImg.js'></script>
<!-- speller script -->
<script type='text/javascript' language='JavaScript' src="/speller/pages/spellChecker.js"></script>
<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/speller.js'></script>
<!-- end speller script -->
<!-- Hide/Show Script for main marketing area -->
<script type="text/javascript" language="javascript">
function hideShow(id)
{
var navpoint = document.getElementById(id);
if (navpoint.className == 'hidden') {
navpoint.className = 'shown';
} else {
navpoint.className = 'hidden';
}
}
</script>
<!-- end Hide/Show script -->
</head>
<body>
<!-- HEADER START -->
<!-- this image creates IE problems -->
<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> -->
<!-- GWT script -->
<script language="javascript" src="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/gwt.js"></script>
<div class="brand_FED" id="container">
<div id="TopLogo">
<img src="http://jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" />
</div>
<div id="TopMenu">
<table cellpadding="0" cellspacing="0">
<tbody><tr>
<td class="menu_JBnetwork"><a href="http://network.jboss.com/">Support</a></td>
<td class="menu_JBjems"><a href="http://www.jboss.com/products/index">Products</a></td>
<td class="menu_JBcom"><a href="http://www.jboss.com/partners/index">Partners</a></td>
<td class="menu_JBfed"><a href="http://labs.jboss.com">JBoss Labs</a></td>
</tr>
</tbody></table>
</div>
<div id="ControlMenu">
<form id="TopSearch" action="http://www.google.com/search" onsubmit="document.forms[0].q.value = document.forms[0].q.value + ' site:jboss.org';">
<ul>
<li><a href="<%
String url = request.getRequestURL().append((request.getQueryString() != null && request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString();
if (url.contains("/authsec") || url.contains("/auth")) {
out.print(url);
}
else {
out.print(url.replace("/portal","/portal/authsec"));
}%>">Login</a></li>
<li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li>
<li><a href="http://www.jboss.com/careers">Careers</a></li>
<li><a href="http://www.jboss.com/company/contact">Contact Us</a></li>
<li>
<input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="q" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." />
<input class="searchbutton" type="image" src="/file-access/default/theme/images/spacer.gif" value="go" align="middle" />
</li>
</ul>
</form>
</div>
<!-- HEADER END -->
<!-- main page table -->
<table id="BodyTable" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td colspan="4" class="topheader"></td>
</tr>
<tr>
<td class="leftside" rowspan="2"><p:region regionName='left'/></td>
<td class="bodycell" colspan="2"><p:region regionName='center'/></td>
<td class="rightside" rowspan="2"><p:region regionName='right'/></td>
</tr>
<tr>
<td class="innerleft"><p:region regionName='innerleft'/></td>
<td class="innerright"><p:region regionName='innerright'/></td>
</tr>
</tbody>
</table>
<div id="jbfPageFooter">
<div id="Copyright">
JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br />
Theme made by <a href="http://mamut.net.pl">Szimano</a>
</div>
</div>
</body>
</html>
\ No newline at end of file
+<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
<html xmlns="http://www.w3.org/1999/xhtml">
<!--
JBoss, the OpenSource J2EE webOS
Distributable under LGPL license.
See terms of license at gnu.org.
-->
<head><title>JBoss.ORG</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="gwt:module" content="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/org.jboss.labs.tagme.gwt.TagMe" />
<link rel="stylesheet" href="/file-access/default/theme/css/print.css" type="text/css" media="print" />
<link rel="stylesheet" href="/file-access/default/theme/css/common.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge-forums.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/portlet.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/podcasts.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/primates.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/blog.css" type="text/css" media="all" />
<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default -->
<!-- <p:theme themeName='jboss-forge' /> -->
<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqCfg.js'></script>
<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqImg.js'></script>
<!-- speller script -->
<script type='text/javascript' language='JavaScript' src="/speller/pages/spellChecker.js"></script>
<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/speller.js'></script>
<!-- end speller script -->
<!-- Hide/Show Script for main marketing area -->
<script type="text/javascript" language="javascript">
function hideShow(id)
{
var navpoint = document.getElementById(id);
if (navpoint.className == 'hidden') {
navpoint.className = 'shown';
} else {
navpoint.className = 'hidden';
}
}
</script>
<!-- end Hide/Show script -->
</head>
<body>
<!-- HEADER START -->
<!-- this image creates IE problems -->
<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> -->
<!-- GWT script -->
<script language="javascript" src="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/gwt.js"></script>
<div class="brand_FED" id="container">
<div id="TopLogo">
<img src="http://jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" />
</div>
<div id="TopMenu">
<table cellpadding="0" cellspacing="0">
<tbody><tr>
<td class="menu_JBnetwork"><a href="http://network.jboss.com/">Support</a></td>
<td class="menu_JBjems"><a href="http://www.jboss.com/products/index">Products</a></td>
<td class="menu_JBcom"><a href="http://www.jboss.com/partners/index">Partners</a></td>
<td class="menu_JBfed"><a href="http://labs.jboss.com">JBoss Labs</a></td>
</tr>
</tbody></table>
</div>
<div id="ControlMenu">
<form id="TopSearch" action="http://www.google.com/search" onsubmit="document.forms[0].q.value = document.forms[0].q.value + ' site:jboss.org';">
<ul>
<li><a href="<%
String url = request.getRequestURL().append((request.getQueryString() != null && request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString();
if (url.contains("/authsec") || url.contains("/auth")) {
out.print(url);
}
else {
out.print(url.replace("/portal","/portal/authsec"));
}%>">Login</a></li>
<li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li>
<li><a href="http://www.jboss.com/careers">Careers</a></li>
<li><a href="http://www.jboss.com/company/contact">Contact Us</a></li>
<li>
<input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="q" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." />
<input class="searchbutton" type="image" src="/file-access/default/theme/images/spacer.gif" value="go" align="middle" />
</li>
</ul>
</form>
</div>
<!-- HEADER END -->
<!-- main page table -->
<table id="BodyTable" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td colspan="4" class="topheader"></td>
</tr>
<tr>
<td class="leftside" rowspan="2"><p:region regionName='left'/></td>
<td class="bodycell" colspan="3"><p:region regionName='center'/></td>
</tr>
<tr>
<td class="innerleft"><p:region regionName='innerleft'/></td>
<td class="innerright"><p:region regionName='innerright'/></td>
+ <td class="rightside"><p:region regionName='right'/></td>
</tr>
</tbody>
</table>
<div id="jbfPageFooter">
<div id="Copyright">
JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br />
Theme made by <a href="http://mamut.net.pl">Szimano</a>
</div>
</div>
</body>
</html>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2006-06-07 21:24:29 UTC (rev 4654)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2006-06-07 21:28:18 UTC (rev 4655)
@@ -78,7 +78,7 @@
<window>
<window-name>PrimatesPortletWindowDefaultDefault</window-name>
<instance-ref>PrimatesPortletMugshotInstance</instance-ref>
- <region>right</region>
+ <region>innerright</region>
<height>0</height>
</window>
<window>
@@ -99,17 +99,17 @@
<region>left</region>
<height>2</height>
</window>
- <window>
+ <!-- <window>
<window-name>PollsPortletWindowDefaultRandom</window-name>
<instance-ref>PollsPortletInstanceRandom</instance-ref>
<region>right</region>
<height>1</height>
- </window>
+ </window> -->
<window>
<window-name>FreezonePortletWindowDefaultRight</window-name>
<instance-ref>FreezoneRightPanelPortletInstance</instance-ref>
<region>right</region>
- <height>1</height>
+ <height>0</height>
</window>
<!--<window>
<window-name>FreezonePortletWindowDefaultDownloads</window-name>
|
|
From: <jbo...@li...> - 2006-06-07 21:06:33
|
Author: unibrew Date: 2006-06-07 17:06:27 -0400 (Wed, 07 Jun 2006) New Revision: 4653 Modified: labs/jbosslabs/trunk/portal-extensions/counters-ejb3/src/web/WEB-INF/persistence.xml Log: Datasource name change Modified: labs/jbosslabs/trunk/portal-extensions/counters-ejb3/src/web/WEB-INF/persistence.xml =================================================================== --- labs/jbosslabs/trunk/portal-extensions/counters-ejb3/src/web/WEB-INF/persistence.xml 2006-06-07 20:58:07 UTC (rev 4652) +++ labs/jbosslabs/trunk/portal-extensions/counters-ejb3/src/web/WEB-INF/persistence.xml 2006-06-07 21:06:27 UTC (rev 4653) @@ -1,8 +1,8 @@ <entity-manager> <name>counters</name> - <jta-data-source>java:/JBossDS</jta-data-source> + <jta-data-source>java:/LabsDS</jta-data-source> <properties> - <property name="hibernate.connection.datasource" value="JBossDS" /> + <property name="hibernate.connection.datasource" value="LabsDS" /> <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" /> <property name="hibernate.hbm2ddl.auto" value="update" /> </properties> |
|
From: <jbo...@li...> - 2006-06-07 20:58:23
|
Author: adamw Date: 2006-06-07 16:58:07 -0400 (Wed, 07 Jun 2006) New Revision: 4652 Added: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagListImpl.java labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/ShotokuTagEntity.java labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/WebsiteTagEntity.java Removed: labs/shotoku/trunk/shotoku-tags/src/java/dal/ Modified: labs/shotoku/trunk/shotoku-tags/project.properties labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/AbstractTag.java labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/ShotokuTag.java labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/Tag.java labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagList.java labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/WebsiteTag.java labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/TagEntity.java labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/TagsTestServlet.java labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/servlet/ShotokuServlet.java Log: http://jira.jboss.com/jira/browse/JBSHOTOKU-86 Modified: labs/shotoku/trunk/shotoku-tags/project.properties =================================================================== --- labs/shotoku/trunk/shotoku-tags/project.properties 2006-06-07 20:23:52 UTC (rev 4651) +++ labs/shotoku/trunk/shotoku-tags/project.properties 2006-06-07 20:58:07 UTC (rev 4652) @@ -2,3 +2,5 @@ maven.final.name=${pom.artifactId} +maven.war.classes.includes=**/test/* + Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/AbstractTag.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/AbstractTag.java 2006-06-07 20:23:52 UTC (rev 4651) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/AbstractTag.java 2006-06-07 20:58:07 UTC (rev 4652) @@ -1,12 +1,14 @@ package org.jboss.shotoku.tags; +import org.jboss.shotoku.tags.dal.TagEntity; + import java.util.Date; /** * @author Adam Warski (ad...@as...) */ public abstract class AbstractTag implements Tag { - private int id; + private Integer id; private String name; private String author; @@ -15,7 +17,7 @@ private Date dateCreated; - public AbstractTag(int id, String name, String author, String resourceId, + public AbstractTag(Integer id, String name, String author, String resourceId, String data, Date dateCreated) { this.id = id; this.name = name; @@ -25,7 +27,20 @@ this.dateCreated = dateCreated; } - public int getId() { + public AbstractTag(TagEntity te) { + this.id = te.getId(); + this.name = te.getName(); + this.author = te.getAuthor(); + this.resourceId = te.getResourceId(); + this.data = te.getData(); + this.dateCreated = te.getDateCreated(); + } + + /* + * TAG implementation. + */ + + public Integer getId() { return id; } Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/ShotokuTag.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/ShotokuTag.java 2006-06-07 20:23:52 UTC (rev 4651) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/ShotokuTag.java 2006-06-07 20:58:07 UTC (rev 4652) @@ -1,22 +1,29 @@ package org.jboss.shotoku.tags; +import org.jboss.shotoku.tags.dal.ShotokuTagEntity; +import org.jboss.shotoku.tags.dal.TagEntity; + import java.util.Date; /** * @author Adam Warski (ad...@as...) */ public class ShotokuTag extends AbstractTag { - public ShotokuTag(int id, String name, String author, String resourceId, + public ShotokuTag(String name, String author, String resourceId, String data, Date dateCreated) { - super(id, name, author, resourceId, data, dateCreated); + super(null, name, author, resourceId, data, dateCreated); } - public ShotokuTag(String name, String author, String resourceId, - String data, Date dateCreated) { - super(-1, name, author, resourceId, data, dateCreated); + public ShotokuTag(ShotokuTagEntity te) { + super(te); } public String getType() { return "shotoku"; } + + public TagEntity getTagEntity() { + //return new ShotokuTagEntity(this); + return new TagEntity(this); + } } Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/Tag.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/Tag.java 2006-06-07 20:23:52 UTC (rev 4651) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/Tag.java 2006-06-07 20:58:07 UTC (rev 4652) @@ -1,12 +1,14 @@ package org.jboss.shotoku.tags; +import org.jboss.shotoku.tags.dal.TagEntity; + import java.util.Date; /** * @author Adam Warski (ad...@as...) */ public interface Tag { - public int getId(); + public Integer getId(); public String getName(); public String getAuthor(); @@ -14,4 +16,6 @@ public String getData(); public String getType(); public Date getDateCreated(); + + public TagEntity getTagEntity(); } Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagList.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagList.java 2006-06-07 20:23:52 UTC (rev 4651) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagList.java 2006-06-07 20:58:07 UTC (rev 4652) @@ -7,5 +7,5 @@ */ public interface TagList { public List<Tag> getList(); - public String getFeedAddress(); + public String getFeedAddress(); } Added: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagListImpl.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagListImpl.java 2006-06-07 20:23:52 UTC (rev 4651) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagListImpl.java 2006-06-07 20:58:07 UTC (rev 4652) @@ -0,0 +1,24 @@ +package org.jboss.shotoku.tags; + +import java.util.List; + +/** + * @author Adam Warski (ad...@as...) + */ +public class TagListImpl implements TagList { + private List<Tag> list; + private String feedAddress; + + public TagListImpl(List<Tag> list, String feedAddress) { + this.list = list; + this.feedAddress = feedAddress; + } + + public List<Tag> getList() { + return list; + } + + public String getFeedAddress() { + return feedAddress; + } +} Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/WebsiteTag.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/WebsiteTag.java 2006-06-07 20:23:52 UTC (rev 4651) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/WebsiteTag.java 2006-06-07 20:58:07 UTC (rev 4652) @@ -1,22 +1,28 @@ package org.jboss.shotoku.tags; +import org.jboss.shotoku.tags.dal.WebsiteTagEntity; +import org.jboss.shotoku.tags.dal.TagEntity; + import java.util.Date; /** * @author Adam Warski (ad...@as...) */ public class WebsiteTag extends AbstractTag { - public WebsiteTag(int id, String name, String author, String resourceId, + public WebsiteTag(String name, String author, String resourceId, String data, Date dateCreated) { - super(id, name, author, resourceId, data, dateCreated); + super(null, name, author, resourceId, data, dateCreated); } - public WebsiteTag(String name, String author, String resourceId, - String data, Date dateCreated) { - super(-1, name, author, resourceId, data, dateCreated); + public WebsiteTag(WebsiteTagEntity te) { + super(te); } public String getType() { return "website"; } + + public TagEntity getTagEntity() { + return new WebsiteTagEntity(this); + } } Copied: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal (from rev 4649, labs/shotoku/trunk/shotoku-tags/src/java/dal) Added: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/ShotokuTagEntity.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/dal/ShotokuTagEntity.java 2006-06-06 21:56:17 UTC (rev 4649) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/ShotokuTagEntity.java 2006-06-07 20:58:07 UTC (rev 4652) @@ -0,0 +1,23 @@ +package org.jboss.shotoku.tags.dal; + +import org.jboss.shotoku.tags.AbstractTag; +import org.jboss.shotoku.tags.ShotokuTag; +import org.jboss.shotoku.tags.Tag; + +/** + * @author Adam Warski (ad...@as...) + */ +/*@Entity +@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +@DiscriminatorColumn(discriminatorType = DiscriminatorType.STRING) +@DiscriminatorValue("shotoku") */ +public class ShotokuTagEntity extends TagEntity { + public ShotokuTagEntity(Tag t) { + super(t); + } + + //@Transient + public AbstractTag getTag() { + return new ShotokuTag(this); + } +} Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/TagEntity.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/dal/TagEntity.java 2006-06-06 21:56:17 UTC (rev 4649) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/TagEntity.java 2006-06-07 20:58:07 UTC (rev 4652) @@ -1,24 +1,53 @@ -package dal; +package org.jboss.shotoku.tags.dal; +import org.jboss.shotoku.tags.Tag; +import org.jboss.shotoku.tags.AbstractTag; +import org.jboss.shotoku.tags.ShotokuTag; + import javax.persistence.*; +import java.util.Date; +import java.io.Serializable; /** * @author Adam Warski (ad...@as...) */ @Entity +//@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +//@DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.STRING) @Table(name = "ShotokuTags") -public class TagEntity { - private int id; +public /*abstract*/ class TagEntity implements Serializable { + private Integer id; + private String name; + private String author; + private String resourceId; + private String data; - @Id @GeneratedValue(strategy = GenerationType.AUTO) - public int getId() - { + private Date dateCreated; + + public TagEntity() { + + } + + public TagEntity(Tag t) { + //this.id = t.getId(); + this.name = t.getName(); + this.author = t.getAuthor(); + this.resourceId = t.getResourceId(); + this.data = t.getData(); + this.dateCreated = t.getDateCreated(); + } + + /* + * Fields. + */ + + @Id + public Integer getId() { return id; } - public void setId(int id) - { + public void setId(Integer id) { this.id = id; } @@ -29,4 +58,43 @@ public void setName(String name) { this.name = name; } + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public String getResourceId() { + return resourceId; + } + + public void setResourceId(String resourceId) { + this.resourceId = resourceId; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public Date getDateCreated() { + return dateCreated; + } + + public void setDateCreated(Date dateCreated) { + this.dateCreated = dateCreated; + } + + /* + * Other methods. + */ + + //@Transient + //public abstract AbstractTag getTag(); } Added: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/WebsiteTagEntity.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/dal/WebsiteTagEntity.java 2006-06-06 21:56:17 UTC (rev 4649) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/WebsiteTagEntity.java 2006-06-07 20:58:07 UTC (rev 4652) @@ -0,0 +1,23 @@ +package org.jboss.shotoku.tags.dal; + +import org.jboss.shotoku.tags.AbstractTag; +import org.jboss.shotoku.tags.WebsiteTag; +import org.jboss.shotoku.tags.Tag; + +/** + * @author Adam Warski (ad...@as...) + */ +/*@Entity +@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +@DiscriminatorColumn(discriminatorType = DiscriminatorType.STRING) +@DiscriminatorValue("website")*/ +public class WebsiteTagEntity extends TagEntity { + public WebsiteTagEntity(Tag t) { + super(t); + } + + //@Transient + public AbstractTag getTag() { + return new WebsiteTag(this); + } +} Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-06-07 20:23:52 UTC (rev 4651) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-06-07 20:58:07 UTC (rev 4652) @@ -23,6 +23,7 @@ import java.util.Calendar; import java.util.List; +import java.util.ArrayList; import javax.ejb.Local; import javax.persistence.EntityManager; @@ -37,10 +38,8 @@ import org.jboss.shotoku.service.AdministratedServiceImpl; import org.jboss.shotoku.service.AdministratedServiceGetter; import org.jboss.shotoku.service.AdministratedService; -import org.jboss.shotoku.tags.TagService; -import org.jboss.shotoku.tags.TagTools; -import org.jboss.shotoku.tags.Tag; -import org.jboss.shotoku.tags.TagList; +import org.jboss.shotoku.tags.*; +import org.jboss.shotoku.tags.dal.TagEntity; /** * @author Adam Warski (ad...@as...) @@ -142,15 +141,22 @@ private EntityManager manager; public void addTag(Tag t) { - + manager.persist(t.getTagEntity()); } public void deleteTag(Tag t) { } public TagList getTags(String resourceId) { - manager.createQuery("from TagEntity where name = :name").setParameter( - "name", resourceId).getResultList(); + /*List<TagEntity> result = manager.createQuery("from TagEntity where resourceId = :resourceId"). + setParameter("resourceId", resourceId).getResultList(); + + List<Tag> t = new ArrayList<Tag>(); + for (TagEntity te : result) { + t.add(te.) + } + + return new TagListImpl(ret, ""); */ return null; } Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/TagsTestServlet.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/TagsTestServlet.java 2006-06-07 20:23:52 UTC (rev 4651) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/TagsTestServlet.java 2006-06-07 20:58:07 UTC (rev 4652) @@ -1,12 +1,15 @@ package org.jboss.shotoku.tags.test; import org.jboss.shotoku.tags.TagTools; +import org.jboss.shotoku.tags.ShotokuTag; +import org.jboss.shotoku.tags.Tag; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletException; import java.io.IOException; +import java.util.Calendar; /** * @author Adam Warski (ad...@as...) @@ -17,6 +20,11 @@ httpServletResponse.setContentType("text/html"); httpServletResponse.getWriter().println(TagTools.getService().getServiceName()); - TagTools.getService().getTags("aaa"); + TagTools.getService().addTag(new ShotokuTag("n1", "a1", "r1", "d1", + Calendar.getInstance().getTime())); + + /*for (Tag t : TagTools.getService().getTags("r1").getList()) { + httpServletResponse.getWriter().println(t.getName() + " - " + t.getData()); + } */ } } Modified: labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/servlet/ShotokuServlet.java =================================================================== --- labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/servlet/ShotokuServlet.java 2006-06-07 20:23:52 UTC (rev 4651) +++ labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/servlet/ShotokuServlet.java 2006-06-07 20:58:07 UTC (rev 4652) @@ -40,14 +40,15 @@ sb.append(b); }*/ - @CacheItem - private TestCacheItem tci; + /*@CacheItem + private TestCacheItem tci;*/ @Override protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + - System.out.println("Cache content: " + tci.get("A")); + //System.out.println("Cache content: " + tci.get("A")); /*try { response.setContentType("text/html"); |
|
From: <jbo...@li...> - 2006-06-07 20:23:57
|
Author: jam...@jb... Date: 2006-06-07 16:23:52 -0400 (Wed, 07 Jun 2006) New Revision: 4651 Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp Log: moved the hide show function to the head tage of the page. Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-07 18:19:11 UTC (rev 4650) +++ labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-07 20:23:52 UTC (rev 4651) @@ -1 +1 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> <html xmlns="http://www.w3.org/1999/xhtml"> <!-- JBoss, the OpenSource J2EE webOS Distributable under LGPL license. See terms of license at gnu.org. --> <head><title>JBoss.ORG</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta name="gwt:module" content="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/org.jboss.labs.tagme.gwt.TagMe" /> <link rel="stylesheet" href="/file-access/default/theme/css/print.css" type="text/css" media="print" /> <link rel="stylesheet" href="/file-access/default/theme/css/common.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge-forums.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/portlet.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/podcasts.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/primates.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/blog.css" type="text/css" media="all" /> <!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> <!-- <p:theme themeName='jboss-forge' /> --> <script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqCfg.js'></script> <script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqImg.js'></script> <!-- speller script --> <script type='text/javascript' language='JavaScript' src="/speller/pages/spellChecker.js"></script> <script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/speller.js'></script> <!-- end speller script --> </head> <body> <!-- HEADER START --> <!-- this image creates IE problems --> <!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> <!-- GWT script --> <script language="javascript" src="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/gwt.js"></script> <div class="brand_FED" id="container"> <div id="TopLogo"> <img src="http://jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" /> </div> <div id="TopMenu"> <table cellpadding="0" cellspacing="0"> <tbody><tr> <td class="menu_JBnetwork"><a href="http://network.jboss.com/">Support</a></td> <td class="menu_JBjems"><a href="http://www.jboss.com/products/index">Products</a></td> <td class="menu_JBcom"><a href="http://www.jboss.com/partners/index">Partners</a></td> <td class="menu_JBfed"><a href="http://labs.jboss.com">JBoss Labs</a></td> </tr> </tbody></table> </div> <div id="ControlMenu"> <form id="TopSearch" action="http://www.google.com/search" onsubmit="document.forms[0].q.value = document.forms[0].q.value + ' site:jboss.org';"> <ul> <li><a href="<% String url = request.getRequestURL().append((request.getQueryString() != null && request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString(); if (url.contains("/authsec") || url.contains("/auth")) { out.print(url); } else { out.print(url.replace("/portal","/portal/authsec")); }%>">Login</a></li> <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> <li><a href="http://www.jboss.com/careers">Careers</a></li> <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> <li> <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="q" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> <input class="searchbutton" type="image" src="/file-access/default/theme/images/spacer.gif" value="go" align="middle" /> </li> </ul> </form> </div> <!-- HEADER END --> <!-- main page table --> <table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> <td colspan="4" class="topheader"></td> </tr> <tr> <td class="leftside" rowspan="2"><p:region regionName='left'/></td> <td class="bodycell" colspan="2"><p:region regionName='center'/></td> <td class="rightside" rowspan="2"><p:region regionName='right'/></td> </tr> <tr> <td class="innerleft"><p:region regionName='innerleft'/></td> <td class="innerright"><p:region regionName='innerright'/></td> </tr> </tbody> </table> <div id="jbfPageFooter"> <div id="Copyright"> JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br /> Theme made by <a href="http://mamut.net.pl">Szimano</a> </div> </div> </body> </html> \ No newline at end of file +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> <html xmlns="http://www.w3.org/1999/xhtml"> <!-- JBoss, the OpenSource J2EE webOS Distributable under LGPL license. See terms of license at gnu.org. --> <head><title>JBoss.ORG</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta name="gwt:module" content="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/org.jboss.labs.tagme.gwt.TagMe" /> <link rel="stylesheet" href="/file-access/default/theme/css/print.css" type="text/css" media="print" /> <link rel="stylesheet" href="/file-access/default/theme/css/common.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge-forums.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/portlet.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/podcasts.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/primates.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/blog.css" type="text/css" media="all" /> <!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> <!-- <p:theme themeName='jboss-forge' /> --> <script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqCfg.js'></script> <script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqImg.js'></script> <!-- speller script --> <script type='text/javascript' language='JavaScript' src="/speller/pages/spellChecker.js"></script> <script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/speller.js'></script> <!-- end speller script --> <!-- Hide/Show Script for main marketing area --> <script type="text/javascript" language="javascript"> function hideShow(id) { var navpoint = document.getElementById(id); if (navpoint.className == 'hidden') { navpoint.className = 'shown'; } else { navpoint.className = 'hidden'; } } </script> <!-- end Hide/Show script --> </head> <body> <!-- HEADER START --> <!-- this image creates IE problems --> <!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> <!-- GWT script --> <script language="javascript" src="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/gwt.js"></script> <div class="brand_FED" id="container"> <div id="TopLogo"> <img src="http://jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" /> </div> <div id="TopMenu"> <table cellpadding="0" cellspacing="0"> <tbody><tr> <td class="menu_JBnetwork"><a href="http://network.jboss.com/">Support</a></td> <td class="menu_JBjems"><a href="http://www.jboss.com/products/index">Products</a></td> <td class="menu_JBcom"><a href="http://www.jboss.com/partners/index">Partners</a></td> <td class="menu_JBfed"><a href="http://labs.jboss.com">JBoss Labs</a></td> </tr> </tbody></table> </div> <div id="ControlMenu"> <form id="TopSearch" action="http://www.google.com/search" onsubmit="document.forms[0].q.value = document.forms[0].q.value + ' site:jboss.org';"> <ul> <li><a href="<% String url = request.getRequestURL().append((request.getQueryString() != null && request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString(); if (url.contains("/authsec") || url.contains("/auth")) { out.print(url); } else { out.print(url.replace("/portal","/portal/authsec")); }%>">Login</a></li> <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> <li><a href="http://www.jboss.com/careers">Careers</a></li> <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> <li> <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="q" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> <input class="searchbutton" type="image" src="/file-access/default/theme/images/spacer.gif" value="go" align="middle" /> </li> </ul> </form> </div> <!-- HEADER END --> <!-- main page table --> <table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> <td colspan="4" class="topheader"></td> </tr> <tr> <td class="leftside" rowspan="2"><p:region regionName='left'/></td> <td class="bodycell" colspan="2"><p:region regionName='center'/></td> <td class="rightside" rowspan="2"><p:region regionName='right'/></td> </tr> <tr> <td class="innerleft"><p:region regionName='innerleft'/></td> <td class="innerright"><p:region regionName='innerright'/></td> </tr> </tbody> </table> <div id="jbfPageFooter"> <div id="Copyright"> JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br /> Theme made by <a href="http://mamut.net.pl">Szimano</a> </div> </div> </body> </html> \ No newline at end of file |
|
From: <jbo...@li...> - 2006-06-07 18:19:31
|
Author: jam...@jb... Date: 2006-06-07 14:19:11 -0400 (Wed, 07 Jun 2006) New Revision: 4650 Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp Log: removed redundant css reference to "screen.css". Removed all commented out .css references. Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-06 21:56:17 UTC (rev 4649) +++ labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-07 18:19:11 UTC (rev 4650) @@ -1,131 +1 @@ -<!DOCTYPE html -PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" -"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - -<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> -<html xmlns="http://www.w3.org/1999/xhtml"> -<!-- - JBoss, the OpenSource J2EE webOS - Distributable under LGPL license. - See terms of license at gnu.org. - --> -<head><title>JBoss.ORG</title> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> -<meta name="gwt:module" content="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/org.jboss.labs.tagme.gwt.TagMe" /> -<!-- changed to local CSS for now - -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/screen.css" type="text/css" media="screen"> -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/print.css" type="text/css" media="print"> -<link rel="stylesheet" href="http://www.jboss.com/themes/jbosstheme/style/common.css" type="text/css" media="all"> - --> -<link rel="stylesheet" href="/file-access/default/theme/css/screen.css" type="text/css" media="screen" /> -<link rel="stylesheet" href="/file-access/default/theme/css/print.css" type="text/css" media="print" /> -<link rel="stylesheet" href="/file-access/default/theme/css/common.css" type="text/css" media="all" /> -<link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge.css" type="text/css" media="all" /> -<link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge-forums.css" type="text/css" media="all" /> -<link rel="stylesheet" href="/file-access/default/theme/css/portlet.css" type="text/css" media="all" /> -<!-- <link rel="stylesheet" href="/file-access/default/theme/css/graphs.css" type="text/css" media="all" /> --> - -<link rel="stylesheet" href="/file-access/default/theme/css/podcasts.css" type="text/css" media="all" /> -<link rel="stylesheet" href="/file-access/default/theme/css/primates.css" type="text/css" media="all" /> -<link rel="stylesheet" href="/file-access/default/theme/css/blog.css" type="text/css" media="all" /> -<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> - <!-- <p:theme themeName='jboss-forge' /> --> - -<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqCfg.js'></script> -<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqImg.js'></script> - -<!-- speller script --> -<script type='text/javascript' language='JavaScript' src="/speller/pages/spellChecker.js"></script> - -<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/speller.js'></script> -<!-- end speller script --> - - -</head> - - -<body> -<!-- HEADER START --> -<!-- this image creates IE problems --> -<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> - -<!-- GWT script --> -<script language="javascript" src="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/gwt.js"></script> - - -<div class="brand_FED" id="container"> - -<div id="TopLogo"> - <img src="http://jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" /> -</div> -<div id="TopMenu"> - <table cellpadding="0" cellspacing="0"> - <tbody><tr> - <td class="menu_JBnetwork"><a href="http://network.jboss.com/">Support</a></td> - <td class="menu_JBjems"><a href="http://www.jboss.com/products/index">Products</a></td> - <td class="menu_JBcom"><a href="http://www.jboss.com/partners/index">Partners</a></td> - <td class="menu_JBfed"><a href="http://labs.jboss.com">JBoss Labs</a></td> - </tr> - </tbody></table> -</div> -<div id="ControlMenu"> - <form id="TopSearch" action="http://www.google.com/search" onsubmit="document.forms[0].q.value = document.forms[0].q.value + ' site:jboss.org';"> - <ul> - <li><a href="<% - - String url = request.getRequestURL().append((request.getQueryString() != null && request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString(); - - if (url.contains("/authsec") || url.contains("/auth")) { - out.print(url); - } - else { - out.print(url.replace("/portal","/portal/authsec")); - }%>">Login</a></li> - - <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> - <li><a href="http://www.jboss.com/careers">Careers</a></li> - <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> - <li> - <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="q" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> - <input class="searchbutton" type="image" src="/file-access/default/theme/images/spacer.gif" value="go" align="middle" /> - </li> - </ul> - </form> - -</div> -<!-- HEADER END --> - -<!-- main page table --> -<table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> -<tbody> - <tr> - <td colspan="4" class="topheader"></td> - </tr> - <tr> - <td class="leftside" rowspan="2"><p:region regionName='left'/></td> - <td class="bodycell" colspan="2"><p:region regionName='center'/></td> - <td class="rightside" rowspan="2"><p:region regionName='right'/></td> - </tr> - <tr> - <td class="innerleft"><p:region regionName='innerleft'/></td> - <td class="innerright"><p:region regionName='innerright'/></td> - </tr> -</tbody> -</table> - -<div id="jbfPageFooter"> - <div id="Copyright"> - JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br /> -Theme made by <a href="http://mamut.net.pl">Szimano</a> - </div> -</div> - - - -</body> -</html> - - - - +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> <html xmlns="http://www.w3.org/1999/xhtml"> <!-- JBoss, the OpenSource J2EE webOS Distributable under LGPL license. See terms of license at gnu.org. --> <head><title>JBoss.ORG</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta name="gwt:module" content="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/org.jboss.labs.tagme.gwt.TagMe" /> <link rel="stylesheet" href="/file-access/default/theme/css/print.css" type="text/css" media="print" /> <link rel="stylesheet" href="/file-access/default/theme/css/common.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge-forums.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/portlet.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/podcasts.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/primates.css" type="text/css" media="all" /> <link rel="stylesheet" href="/file-access/default/theme/css/blog.css" type="text/css" media="all" /> <!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default --> <!-- <p:theme themeName='jboss-forge' /> --> <script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqCfg.js'></script> <script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqImg.js'></script> <!-- speller script --> <script type='text/javascript' language='JavaScript' src="/speller/pages/spellChecker.js"></script> <script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/speller.js'></script> <!-- end speller script --> </head> <body> <!-- HEADER START --> <!-- this image creates IE problems --> <!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> --> <!-- GWT script --> <script language="javascript" src="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/gwt.js"></script> <div class="brand_FED" id="container"> <div id="TopLogo"> <img src="http://jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" /> </div> <div id="TopMenu"> <table cellpadding="0" cellspacing="0"> <tbody><tr> <td class="menu_JBnetwork"><a href="http://network.jboss.com/">Support</a></td> <td class="menu_JBjems"><a href="http://www.jboss.com/products/index">Products</a></td> <td class="menu_JBcom"><a href="http://www.jboss.com/partners/index">Partners</a></td> <td class="menu_JBfed"><a href="http://labs.jboss.com">JBoss Labs</a></td> </tr> </tbody></table> </div> <div id="ControlMenu"> <form id="TopSearch" action="http://www.google.com/search" onsubmit="document.forms[0].q.value = document.forms[0].q.value + ' site:jboss.org';"> <ul> <li><a href="<% String url = request.getRequestURL().append((request.getQueryString() != null && request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString(); if (url.contains("/authsec") || url.contains("/auth")) { out.print(url); } else { out.print(url.replace("/portal","/portal/authsec")); }%>">Login</a></li> <li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li> <li><a href="http://www.jboss.com/careers">Careers</a></li> <li><a href="http://www.jboss.com/company/contact">Contact Us</a></li> <li> <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="q" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." /> <input class="searchbutton" type="image" src="/file-access/default/theme/images/spacer.gif" value="go" align="middle" /> </li> </ul> </form> </div> <!-- HEADER END --> <!-- main page table --> <table id="BodyTable" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> <td colspan="4" class="topheader"></td> </tr> <tr> <td class="leftside" rowspan="2"><p:region regionName='left'/></td> <td class="bodycell" colspan="2"><p:region regionName='center'/></td> <td class="rightside" rowspan="2"><p:region regionName='right'/></td> </tr> <tr> <td class="innerleft"><p:region regionName='innerleft'/></td> <td class="innerright"><p:region regionName='innerright'/></td> </tr> </tbody> </table> <div id="jbfPageFooter"> <div id="Copyright"> JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br /> Theme made by <a href="http://mamut.net.pl">Szimano</a> </div> </div> </body> </html> \ No newline at end of file |
Author: adamw Date: 2006-06-06 17:56:17 -0400 (Tue, 06 Jun 2006) New Revision: 4649 Added: labs/shotoku/trunk/shotoku-tags/src/etc/META-INF/ labs/shotoku/trunk/shotoku-tags/src/etc/META-INF/persistence.xml labs/shotoku/trunk/shotoku-tags/src/java/dal/ labs/shotoku/trunk/shotoku-tags/src/java/dal/TagEntity.java labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/TagsTestServlet.java Modified: labs/shotoku/trunk/shotoku-tags/maven.xml labs/shotoku/trunk/shotoku-tags/project.xml labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java Log: http://jira.jboss.com/jira/browse/JBSHOTOKU-86 Modified: labs/shotoku/trunk/shotoku-tags/maven.xml =================================================================== --- labs/shotoku/trunk/shotoku-tags/maven.xml 2006-06-06 21:27:21 UTC (rev 4648) +++ labs/shotoku/trunk/shotoku-tags/maven.xml 2006-06-06 21:56:17 UTC (rev 4649) @@ -6,6 +6,7 @@ <goal name="build"> <attainGoal name="java:compile" /> <attainGoal name="ejb" /> + <attainGoal name="war" /> </goal> <goal name="deploy"> @@ -13,6 +14,9 @@ file="target/shotoku-tags.jar" tofile="${local.deploy.dir}/shotoku-tags.ejb3" overwrite="true" /> + <ant:copy + file="target/shotoku-tags.war" + todir="${local.deploy.dir}" /> </goal> <goal name="all"> Modified: labs/shotoku/trunk/shotoku-tags/project.xml =================================================================== --- labs/shotoku/trunk/shotoku-tags/project.xml 2006-06-06 21:27:21 UTC (rev 4648) +++ labs/shotoku/trunk/shotoku-tags/project.xml 2006-06-06 21:56:17 UTC (rev 4649) @@ -11,6 +11,31 @@ <artifactId>shotoku-base</artifactId> <jar>shotoku-base.jar</jar> </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>ejb3-persistence</artifactId> + <jar>ejb3-persistence.jar</jar> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3x</artifactId> + <jar>jboss-ejb3x.jar</jar> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-j2ee</artifactId> + <jar>jboss-j2ee.jar</jar> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-annotations-ejb3</artifactId> + <jar>jboss-annotations-ejb3.jar</jar> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet</artifactId> + <jar>javax.servlet.jar</jar> + </dependency> </dependencies> <build> Added: labs/shotoku/trunk/shotoku-tags/src/etc/META-INF/persistence.xml =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/etc/META-INF/persistence.xml 2006-06-06 21:27:21 UTC (rev 4648) +++ labs/shotoku/trunk/shotoku-tags/src/etc/META-INF/persistence.xml 2006-06-06 21:56:17 UTC (rev 4649) @@ -0,0 +1,9 @@ +<entity-manager> + <name>tags</name> + <jta-data-source>java:/JBossDS</jta-data-source> + <properties> + <property name="hibernate.connection.datasource" value="JBossDS" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" /> + <property name="hibernate.hbm2ddl.auto" value="update" /> + </properties> +</entity-manager> Added: labs/shotoku/trunk/shotoku-tags/src/java/dal/TagEntity.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/dal/TagEntity.java 2006-06-06 21:27:21 UTC (rev 4648) +++ labs/shotoku/trunk/shotoku-tags/src/java/dal/TagEntity.java 2006-06-06 21:56:17 UTC (rev 4649) @@ -0,0 +1,32 @@ +package dal; + +import javax.persistence.*; + +/** + * @author Adam Warski (ad...@as...) + */ +@Entity +@Table(name = "ShotokuTags") +public class TagEntity { + private int id; + private String name; + + @Id @GeneratedValue(strategy = GenerationType.AUTO) + public int getId() + { + return id; + } + + public void setId(int id) + { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-06-06 21:27:21 UTC (rev 4648) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-06-06 21:56:17 UTC (rev 4649) @@ -25,6 +25,8 @@ import java.util.List; import javax.ejb.Local; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; import org.apache.log4j.Logger; import org.jboss.annotation.ejb.Management; @@ -49,7 +51,7 @@ @Management(TagService.class) @Depends(Constants.SHOTOKU_SERVICE_NAME) public class TagServiceImpl extends AdministratedServiceImpl - implements TagService, TagServiceLocal { + implements TagService, TagServiceLocal { private static final Logger log = Logger.getLogger(TagService.class); /* @@ -136,6 +138,9 @@ * TagService implementation. */ + @PersistenceContext + private EntityManager manager; + public void addTag(Tag t) { } @@ -143,11 +148,13 @@ public void deleteTag(Tag t) { } - public TagList getTags(List<String> tagNames) { + public TagList getTags(String resourceId) { + manager.createQuery("from TagEntity where name = :name").setParameter( + "name", resourceId).getResultList(); return null; } - public TagList getTags(String resourceId) { + public TagList getTags(List<String> tagNames) { return null; } Added: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/TagsTestServlet.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/TagsTestServlet.java 2006-06-06 21:27:21 UTC (rev 4648) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/test/TagsTestServlet.java 2006-06-06 21:56:17 UTC (rev 4649) @@ -0,0 +1,22 @@ +package org.jboss.shotoku.tags.test; + +import org.jboss.shotoku.tags.TagTools; + +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.ServletException; +import java.io.IOException; + +/** + * @author Adam Warski (ad...@as...) + */ +public class TagsTestServlet extends HttpServlet { + + protected void doGet(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws ServletException, IOException { + httpServletResponse.setContentType("text/html"); + httpServletResponse.getWriter().println(TagTools.getService().getServiceName()); + + TagTools.getService().getTags("aaa"); + } +} |
|
From: <jbo...@li...> - 2006-06-06 21:27:34
|
Author: jfr...@jb...
Date: 2006-06-06 17:27:21 -0400 (Tue, 06 Jun 2006)
New Revision: 4648
Modified:
labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Add missing libaries.
Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-06-06 21:03:17 UTC (rev 4647)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-06-06 21:27:21 UTC (rev 4648)
@@ -741,6 +741,10 @@
then
cp -p $TOOLS/GTTX/lib/lib*.so* $TOOLS/PHP/lib
fi
+if ${BUILDXML2}
+then
+ cp -p $TOOLS/LIBXML2/lib/libxml2.so* $TOOLS/PHP/lib
+fi
if ${BUILDPSQL}
then
cp -p $TOOLS/POSTGRESQL/lib/libpq.so* $TOOLS/PHP/lib
@@ -754,10 +758,30 @@
then
cp -p $TOOLS/LPNG/lib/libpng12.so* $TOOLS/PHP/lib
fi
-if ${BUILDXML2}
+if ${BUILDJPEG}
then
- cp -p $TOOLS/LIBXML2/lib/libxml2.so* $TOOLS/PHP/lib
+ cp -p $TOOLS/JPEG/lib/libjpeg.so* $TOOLS/PHP/lib
fi
+if ${BUILDMSQL}
+then
+ cp -p $TOOLS/MSQL/lib/lib*.so* $TOOLS/PHP/lib
+fi
+if ${BUILDLDAP}
+then
+ cp -p $TOOLS/LDAP/lib/lib*.so* $TOOLS/PHP/lib
+fi
+if ${BUILDICNV}
+then
+ cp -p $TOOLS/ICNV/lib/lib*.so* $TOOLS/PHP/lib
+fi
+if ${BUILDFTT2}
+then
+ cp -p $TOOLS/FTT2/lib/lib*.so* $TOOLS/PHP/lib
+fi
+if ${BUILDLBGD}
+then
+ cp -p $TOOLS/LBGD/lib/lib*.so* $TOOLS/PHP/lib
+fi
#
# Build the war file with the demo
|
|
From: <jbo...@li...> - 2006-06-06 21:03:26
|
Author: adamw Date: 2006-06-06 17:03:17 -0400 (Tue, 06 Jun 2006) New Revision: 4647 Added: labs/shotoku/trunk/shotoku-tags/src/etc/ Modified: labs/shotoku/trunk/shotoku-tags/maven.xml labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagService.java labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java Log: http://jira.jboss.com/jira/browse/JBSHOTOKU-86 Modified: labs/shotoku/trunk/shotoku-tags/maven.xml =================================================================== --- labs/shotoku/trunk/shotoku-tags/maven.xml 2006-06-06 12:34:37 UTC (rev 4646) +++ labs/shotoku/trunk/shotoku-tags/maven.xml 2006-06-06 21:03:17 UTC (rev 4647) @@ -11,7 +11,13 @@ <goal name="deploy"> <ant:copy file="target/shotoku-tags.jar" - tofile="../target/${shotoku.sar.dir}/shotoku-tags.ejb3" + tofile="${local.deploy.dir}/shotoku-tags.ejb3" overwrite="true" /> </goal> + + <goal name="all"> + <attainGoal name="clean" /> + <attainGoal name="build" /> + <attainGoal name="deploy" /> + </goal> </project> Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagService.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagService.java 2006-06-06 12:34:37 UTC (rev 4646) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagService.java 2006-06-06 21:03:17 UTC (rev 4647) @@ -12,6 +12,7 @@ public void deleteTag(Tag t); public TagList getTags(List<String> tagNames); - public TagList getTags(String author); + public TagList getTags(String resourceId); + public TagList getTagsByAuthor(String author); public TagList getRelatedTags(List<Tag> relateTo); } Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java =================================================================== --- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-06-06 12:34:37 UTC (rev 4646) +++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-06-06 21:03:17 UTC (rev 4647) @@ -147,7 +147,7 @@ return null; } - public TagList getTags(String author) { + public TagList getTags(String resourceId) { return null; } @@ -155,7 +155,7 @@ return null; } - public List<Tag> getTagsByAuthor(String author) { + public TagList getTagsByAuthor(String author) { return null; } } |
|
From: Cora B. <yli...@je...> - 2006-06-06 20:58:26
|
Investor Alert - WE HAVE A RUNNER ! Big news expected. Here at World Stock Report we work on what we here from the street. We Told you to WATCH A B S Y and now its up again today. Breaking news alert issue - big news coming. Trade Date : 07.06.06 Name : AbsoluteSKY, Inc. Symbol : A B S Y Current Price : $0.95 Tomorrow : $1 Rating : 5(5) Here is a special company that may be set to make a move in the near future - this could be your opportunity to be ahead of the curve! The stocks we profile show a significant increase in stock price and sometimes in days, not months or years. |
|
From: Mail D. S. <Mai...@li...> - 2006-06-06 16:47:53
|
This message was created automatically by mail delivery software.
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:
jbo...@li...
SMTP error from remote mailer after RCPT TO:<jbo...@li...>:
host sc8-sf-list1-new-b.sourceforge.net [10.3.1.93]:
550 relay not permitted
------ This is a copy of the message, including all the headers. ------
Return-path: <jbo...@li...>
Received: from fw01.ext.inap.atl.jboss.com ([64.74.196.247])
by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256)
(Exim 4.44)
id 1FmCh0-0001Uw-Q7
for jbo...@li...; Fri, 02 Jun 2006 09:40:12 -0700
Received: from committer01.frg.pub.inap.atl.jboss.com (committer01.frg.pub.inap.atl.jboss.com [64.74.196.144])
by fw01.ext.inap.atl.jboss.com (8.13.3/8.13.3) with ESMTP id k52Ge9ep004521
for <jbo...@li...>; Fri, 2 Jun 2006 12:40:09 -0400 (EDT)
Received: from www-data by committer01.frg.pub.inap.atl.jboss.com with local (Exim 4.50)
id 1FmCgz-0001zi-O2
for jbo...@li...; Fri, 02 Jun 2006 12:40:09 -0400
To: jbo...@li...
From: jbo...@li...
Subject: JBL Code SVN: r4568 - in labs/jbosslabs/trunk/portal-extensions: forge-tagme/src/java/org/jboss/labs/tagme forge-tagme/src/java/org/jboss/labs/tagme/gwt/client forge-tagme/src/java/org/jboss/labs/tagme/services forge-theme/jbossForgeLayout.war/layouts jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins
Reply-to: jbo...@li...
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <E1F...@co...>
Date: Fri, 02 Jun 2006 12:40:09 -0400
X-Spam-Score: 0.2 (/)
X-Spam-Report: Spam Filtering performed by sourceforge.net.
See http://spamassassin.org/tag/ for more details.
Report problems to http://sf.net/tracker/?func=add&group_id=1&atid=200001
0.2 NO_REAL_NAME From: does not include a real name
Author: szimano
Date: 2006-06-02 12:40:02 -0400 (Fri, 02 Jun 2006)
New Revision: 4568
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RDFPlugin.java
Log:
rdf issue JBLAB-677
tagme window JBLAB-674
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-06-02 15:16:59 UTC (rev 4567)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-06-02 16:40:02 UTC (rev 4568)
@@ -21,7 +21,6 @@
*/
package org.jboss.labs.tagme;
-import java.util.Collections;
import java.util.Vector;
import org.jboss.labs.tagme.gwt.client.TagMeClickListener;
@@ -42,16 +41,10 @@
public Vector getTags(String path, String clas) {
Vector vect = null;
- /*vect.add("piwo"); vect.add("wodka"); vect.add("kefir");
- vect.add("sÅoÅ"); vect.add("kulfon"); vect.add("kret");
- vect.add("polska"); vect.add("europa"); vect.add("Åwiat");*/
-
try {
TagMeTagger tagger = (TagMeTagger)Class.forName(clas).newInstance();
vect = tagger.getTags(path);
-
- Collections.sort(vect);
} catch (InstantiationException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-02 15:16:59 UTC (rev 4567)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-02 16:40:02 UTC (rev 4568)
@@ -21,6 +21,7 @@
*/
package org.jboss.labs.tagme.gwt.client;
+import java.util.HashMap;
import java.util.Vector;
import com.google.gwt.core.client.GWT;
@@ -29,9 +30,10 @@
import com.google.gwt.user.client.rpc.ServiceDefTarget;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.DialogBox;
import com.google.gwt.user.client.ui.FlexTable;
+import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -43,11 +45,11 @@
private String path;
private String user;
-
+
private String clas;
-
+
private Label info;
-
+
private FlexTable table;
public TagMeShowPopupListener(String path, String user, String clas) {
@@ -55,14 +57,16 @@
this.user = user;
this.clas = clas;
}
-
+
public void refreshTags() {
-
- table.clear();
-
+
+ for (int i = 0; i < table.getRowCount(); i++) {
+ table.removeRow(i);
+ }
+
TaggingServiceAsync tagging = (TaggingServiceAsync) GWT
- .create(TaggingService.class);
-
+ .create(TaggingService.class);
+
ServiceDefTarget endpoint = (ServiceDefTarget) tagging;
endpoint.setServiceEntryPoint("/tagme-servlet/tag/");
@@ -70,15 +74,32 @@
public void onSuccess(Object result) {
Vector vect = (Vector) result;
- int cols = (int) Math.sqrt(vect.size());
+ HashMap rows = new HashMap();
+ int rowsNum = 0;
+
for (int i = 0; i < vect.size(); i++) {
- table.setText(i / cols, i % cols, (String) vect.get(i));
+
+ String[] to = ((String) vect.get(i)).split(TagMeClickListener.TAG_SEP);
+
+ String tag = to[0];
+ String user = to[1];
+ String fullName = to[2];
+
+ if (!rows.keySet().contains(user)) {
+ rows.put(user, new Integer(rowsNum));
+ table.setHTML(rowsNum++, 0, "<b>"+fullName+"</b>");
+ }
+
+ int curRow = ((Integer) rows.get(user)).intValue();
+
+ table.setText(curRow, table.getCellCount(curRow), tag);
+
}
}
public void onFailure(Throwable caught) {
- Window.alert("Error ! " + caught.getMessage());
+ Window.alert("Error ! " + caught.getMessage() + " Throwable: " + caught);
}
};
@@ -90,15 +111,15 @@
VerticalPanel panel = new VerticalPanel();
info = new Label();
-
+
panel.add(info);
-
+
table = new FlexTable();
panel.add(table);
Vector textBoxes = new Vector();
-
+
for (int i = 0; i < 3; i++) {
TextBox box = new TextBox();
textBoxes.add(box);
@@ -107,18 +128,43 @@
refreshTags();
- panel.add(new Button("Save", new TagMeClickListener(path, user, clas,
- textBoxes, info, this)));
+ final DialogBox dialog = new DialogBox();
- PopupPanel popUp = new PopupPanel(true);
+ HorizontalPanel btnPanel = new HorizontalPanel();
+ btnPanel.add(new Button("Save", new TagMeClickListener(path, user,
+ clas, textBoxes, info, this)));
+ btnPanel.add(new Button("Close", new ClickListener() {
- popUp.setStyleName(TAGME_STYLE);
-
- popUp.add(panel);
-
- popUp.setPopupPosition(sender.getAbsoluteLeft(), sender.getAbsoluteTop());
-
- popUp.show();
+ public void onClick(Widget sender) {
+ dialog.hide();
+ }
+
+ }));
+
+ panel.add(btnPanel);
+
+ // PopupPanel popUp = new PopupPanel(true);
+
+ // popUp.setStyleName(TAGME_STYLE);
+
+ // popUp.add(panel);
+
+ // popUp.setPopupPosition(sender.getAbsoluteLeft(),
+ // sender.getAbsoluteTop());
+
+ // popUp.show();
+
+ dialog.add(panel);
+
+ dialog.setStyleName(TAGME_STYLE);
+
+ dialog.setText("TagMe!");
+
+ dialog.setPopupPosition(sender.getAbsoluteLeft(), sender
+ .getAbsoluteTop());
+
+ dialog.show();
+
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-02 15:16:59 UTC (rev 4567)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-02 16:40:02 UTC (rev 4568)
@@ -21,10 +21,10 @@
*/
package org.jboss.labs.tagme.services;
-import java.util.Iterator;
import java.util.Map;
import java.util.Vector;
+import org.jboss.labs.tagme.gwt.client.TagMeClickListener;
import org.jboss.logging.Logger;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Node;
@@ -35,11 +35,12 @@
public class ShotokuTaggingService implements TagMeTagger {
private static final String SHOTOKU_TAG = "tag";
-
- private static final Logger log = Logger.getLogger(ShotokuTaggingService.class);
+ private static final Logger log = Logger
+ .getLogger(ShotokuTaggingService.class);
+
public Vector getTags(String path) {
- log.info("Getting tags for: "+path);
+ log.info("Getting tags for: " + path);
ContentManager manager = ContentManager.getContentManager();
Vector<String> tags = new Vector<String>();
@@ -53,7 +54,11 @@
for (String key : map.keySet()) {
log.info(key);
if (key.startsWith(SHOTOKU_TAG)) {
- tags.add(map.get(key));
+ String tag = (String) map.get(key);
+ String user = (String) key.substring(key.indexOf(':') + 1, key
+ .lastIndexOf(':'));
+ tags.add(tag + TagMeClickListener.TAG_SEP + user
+ + TagMeClickListener.TAG_SEP + user);
}
}
} catch (RepositoryException e) {
@@ -68,7 +73,7 @@
}
public void addTag(String user, String path, String tag) {
- log.info("Adding tag: "+tag+" for node: "+path);
+ log.info("Adding tag: " + tag + " for node: " + path);
ContentManager manager = ContentManager.getContentManager();
Node node;
@@ -81,11 +86,11 @@
while (node.getProperty(SHOTOKU_TAG + ":" + user + ":" + i) != null) {
i++;
}
-
+
node.setProperty(SHOTOKU_TAG + ":" + user + ":" + i, tag);
-
+
try {
- node.save("Saving tag: "+tag+" by: "+user);
+ node.save("Saving tag: " + tag + " by: " + user);
} catch (SaveException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-02 15:16:59 UTC (rev 4567)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-02 16:40:02 UTC (rev 4568)
@@ -70,7 +70,7 @@
</tbody></table>
</div>
<div id="ControlMenu">
- <form id="TopSearch" action="http://www.jboss.com/search.jsp">
+ <form id="TopSearch" action="http://www.google.com/search" onsubmit="document.forms[0].q.value = document.forms[0].q.value + ' site:jboss.org';">
<ul>
<li><a href="<%
@@ -87,7 +87,7 @@
<li><a href="http://www.jboss.com/careers">Careers</a></li>
<li><a href="http://www.jboss.com/company/contact">Contact Us</a></li>
<li>
- <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="query" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." />
+ <input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="q" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." />
<input class="searchbutton" type="image" src="/file-access/default/theme/images/spacer.gif" value="go" align="middle" />
</li>
</ul>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RDFPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RDFPlugin.java 2006-06-02 15:16:59 UTC (rev 4567)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/RDFPlugin.java 2006-06-02 16:40:02 UTC (rev 4568)
@@ -48,7 +48,7 @@
public WikiPage process(WikiPage wikiPage, WikiSession wikiSession) {
StringBuilder rdfFeed = new StringBuilder(
"<!-- name=\"generator\" content=\"JBoss Wiki RDFPlugin\" -->\n");
- rdfFeed.append("<rdf:RDF>\n");
+ rdfFeed.append("<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns=\"http://purl.org/rss/1.0/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:sy=\"http://purl.org/rss/1.0/modules/syndication/\">\n");
rdfFeed.append("<channel rdf:about=\"").append(
(String) wikiSession.getAttribute("hostURL")).append("/wiki/")
.append(
|
550 messages has been excluded from this view by a project administrator.
![http://jboss.com/themes/jbosstheme/img/logo.gif"](http://jboss.com/themes/jbosstheme/img/logo.gif"){kind=link}