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...> - 2005-12-10 17:38:12
|
Author: aron.gombas
Date: 2005-12-10 12:37:55 -0500 (Sat, 10 Dec 2005)
New Revision: 1776
Added:
trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/cc_monitoring_pl.properties
trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/jira/jira_monitoring_pl.properties
trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/sf/sf_monitoring_pl.properties
trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/svn/svn_monitoring_pl.properties
trunk/labs/kosmos/web-portlet/WEB-INF/classes/kosmos-taglib_pl.properties
Modified:
trunk/labs/kosmos/build/build.xml
Log:
pl resources added
Modified: trunk/labs/kosmos/build/build.xml
===================================================================
--- trunk/labs/kosmos/build/build.xml 2005-12-10 14:41:56 UTC (rev 1775)
+++ trunk/labs/kosmos/build/build.xml 2005-12-10 17:37:55 UTC (rev 1776)
@@ -21,6 +21,7 @@
<property name="build.dir" location="build"/>
<property name="conf.dir" location="conf-${module.name}"/>
<property name="i18n.dir" location="web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet"/>
+ <property name="taglib.i18n.dir" location="web-portlet/WEB-INF/classes"/>
<property name="src.dir" location="src"/>
<property name="web.dir" location="web-${module.name}"/>
<property name="xdocs.dir" location="xdocs"/>
@@ -75,8 +76,13 @@
</copy>
<!-- convert resource files -->
<native2ascii encoding="ISO-8859-1" src="${i18n.dir}" dest="${dist-bin.classes.dir}/hu/midori/kosmos/${module.name}" includes="**/*monitoring.properties"/>
+ <native2ascii encoding="ISO-8859-1" src="${taglib.i18n.dir}" dest="${dist-bin.classes.dir}" includes="**/kosmos-taglib.properties"/>
<native2ascii encoding="ISO-8859-1" src="${i18n.dir}" dest="${dist-bin.classes.dir}/hu/midori/kosmos/${module.name}" includes="**/*monitoring_fr.properties"/>
+ <native2ascii encoding="ISO-8859-1" src="${taglib.i18n.dir}" dest="${dist-bin.classes.dir}" includes="**/kosmos-taglib_fr.properties"/>
<native2ascii encoding="ISO-8859-2" src="${i18n.dir}" dest="${dist-bin.classes.dir}/hu/midori/kosmos/${module.name}" includes="**/*monitoring_hu.properties"/>
+ <native2ascii encoding="ISO-8859-2" src="${taglib.i18n.dir}" dest="${dist-bin.classes.dir}" includes="**/kosmos-taglib_hu.properties"/>
+ <native2ascii encoding="ISO-8859-2" src="${i18n.dir}" dest="${dist-bin.classes.dir}/hu/midori/kosmos/${module.name}" includes="**/*monitoring_pl.properties"/>
+ <native2ascii encoding="ISO-8859-2" src="${taglib.i18n.dir}" dest="${dist-bin.classes.dir}" includes="**/kosmos-taglib_pl.properties"/>
<!-- copy other binary files -->
<copy todir="${dist-bin.bin.dir}">
<fileset dir="${web.dir}" excludes="**/*.jsp">
Added: trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/cc_monitoring_pl.properties
===================================================================
--- trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/cc_monitoring_pl.properties 2005-12-10 14:41:56 UTC (rev 1775)
+++ trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/cc_monitoring_pl.properties 2005-12-10 17:37:55 UTC (rev 1776)
@@ -0,0 +1,37 @@
+# $Id$
+
+portlet.title=Monitorowanie CruiseControl
+portlet.help=Ten portlet monitoruje proces ciągłej integracji i kompilacji zarządzanej przez <a href="http://cruisecontrol.sourceforge.net">CruiseControl</a>.<br/>. W podręczniku znajdziesz więcej szczegółów konfiguracji i dokładniejszy opis cech portletu.
+
+ccproject.name=Projekt
+ccproject.lastBuildLabel=Etykieta kompilacji
+ccproject.modifications=modyfikacje
+ccproject.status=Status
+ccproject.successRate=Testy zakończone sukcesem
+ccproject.testDetails=Szczegóły testów
+ccproject.timestamp=Znacznik czasowy
+ccproject.lastBuildAge=Wiek ostatniej kompilacji
+
+ccproject.buildTime=Czas kompilacji
+ccproject.testsSucceded=Testy zakończone sukcesem
+ccproject.failures=Porażki
+ccproject.errors=Błędy
+ccproject.tests=Testów w sumie
+ccproject.testsPerCategory=Testy zakończone sukcesem
+
+legend.title=Legenda
+legend.success=Pomyślne kompilacje i testy.
+legend.warning=Pomyślne kompilacje z porażkami i błędami w testach.
+legend.error=Niepomyślne kompilacje.
+legend.buildSuccess=Pomyślna kompilacja.
+legend.buildError=Niepomyślna kompilacja.
+legend.testSuccess=Test zakończony sukcesem.
+legend.testWarning=Test zakończony porażką.
+legend.testError=Test zakończony błędem.
+
+lastupdate=Ostatnia aktualizacja
+
+action.refresh=Odśwież
+action.back=Wstecz
+action.show=Pokaż
+action.showAll=Pokaż wszystkie
Added: trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/jira/jira_monitoring_pl.properties
===================================================================
--- trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/jira/jira_monitoring_pl.properties 2005-12-10 14:41:56 UTC (rev 1775)
+++ trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/jira/jira_monitoring_pl.properties 2005-12-10 17:37:55 UTC (rev 1776)
@@ -0,0 +1,41 @@
+# $Id$
+
+portlet.title=Monitorowanie systemu JIRA
+portlet.help=Ten portlet monitoruje projekty w bazie danych systemu <a href="http://www.atlassian.com/software/jira">JIRA</a>.<br/>W podręczniku znajdziesz więcej szczegółów dotyczących konfiguracji i cech portletu.
+
+jiraproject.name=Projekt
+jiraproject.projectDetails=Szczegóły projektu
+jiraproject.key=Klucz
+jiraproject.lead=Menedżer projektu
+jiraproject.assignees=Przydzieleni
+jiraproject.issueDetails=Szczegóły problemu
+
+jiraproject.description=Opis
+jiraproject.projectUrl=Strona projektu
+jiraproject.issuesByStatus=Problemu według statusu
+
+jiraproject.openIssues=Otware
+jiraproject.codingInProgressIssues=Kodowanie w toku
+jiraproject.reopenedIssues=Otwarte ponownie
+jiraproject.resolvedIssues=Rozwiązane
+jiraproject.closedIssues=Zamknięte
+
+jiraproject.openIssuesByPriority=Otwarte problemy według priorytetu
+jiraproject.openIssuesByAssignee=Otwarte problemy według przydziału
+
+jiraproject.blockerOpenIssues=Blokujący
+jiraproject.criticalOpenIssues=Krytyczny
+jiraproject.majorOpenIssues=Poważny
+jiraproject.minorOpenIssues=Nieznaczny
+jiraproject.trivialOpenIssues=Trywialny
+jiraproject.optionalOpenIssues=Opcjonalny
+
+legend.title=Legenda
+legend.warning=Za dużo otwartych problemów.
+
+lastupdate=Ostatnia aktualizacja.
+
+action.refresh=Odśwież
+action.back=Wstecz
+action.show=Pokaż
+action.showAll=Pokaż wszystkie
Added: trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/sf/sf_monitoring_pl.properties
===================================================================
--- trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/sf/sf_monitoring_pl.properties 2005-12-10 14:41:56 UTC (rev 1775)
+++ trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/sf/sf_monitoring_pl.properties 2005-12-10 17:37:55 UTC (rev 1776)
@@ -0,0 +1,18 @@
+# $Id$
+
+portlet.title=Monitorowanie SourceForge
+portlet.help=Ten portlet monitoruje projekty z <a href="http://www.sourceforge.net">SourceForg-u</a>.<br/>W podręczniku znajdziesz więcej szczegółów na temat cech tego portletu i jego konfiguracji.
+
+sfRelease.packageName=Paczka
+sfRelease.version=Wersji
+sfRelease.date=Data
+sfRelease.age=Wiek
+
+legend.title=Legenda
+legend.new=Nowe wydanie.
+legend.old=Projekt nieaktywny.
+
+lastupdate=Ostatnia aktualizacja
+
+action.refresh=Odśwież
+action.back=Wstecz
Added: trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/svn/svn_monitoring_pl.properties
===================================================================
--- trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/svn/svn_monitoring_pl.properties 2005-12-10 14:41:56 UTC (rev 1775)
+++ trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/svn/svn_monitoring_pl.properties 2005-12-10 17:37:55 UTC (rev 1776)
@@ -0,0 +1,42 @@
+# $Id$
+
+portlet.title=Monitorowanie Subversion
+portlet.help=Ten portlet monitoruje repozytoria będące pod kontrolą systemu <a href="http://subversion.tigris.org/">Subversion</a>.<br/> W podręczniku znajdziesz więcej informacji na temat konfiguracji i cech tego portletu.
+
+svnrepository.location=Lokacja repozytorium
+svnrepository.repositoryDetails=Szczegóły repozytorium
+svnrepository.revision=Wersja
+svnrepository.revisionDetails=Szczegóły wersji
+svnrepository.activityLast7Days=Aktywność w ostatnich 7 dniach
+svnrepository.activityDetails=Szczegóły aktywności
+svnrepository.latestTouchDate=Data ostatniej modyfikacji
+svnrepository.latestTouchAge=Wiek ostatniej modyfikacji
+
+svnrepository.dirs=Foldery
+svnrepository.files=Pliki
+svnrepository.totalRepositoryEntries=Całkowita liczba pozycji
+svnrepository.totalFileSize=Suma rozmiarów plików
+svnrepository.repositoryEntryHistory=Historia pozycji
+
+svnrepository.mostActiveCommitters=Najbardziej aktywni autorzy
+svnrepository.mostActiveFiles=Najbardziej aktywne pliki
+
+svnrepository.commitsTotal=Zapisów w sumie
+svnrepository.commitsToday=Zapisów dzisiaj
+svnrepository.commitsLast7Days=Zapisów w ostatnich 7 dniach
+svnrepository.commitsLast31Days=Zapisów w ostatnich 31 dniach
+svnrepository.committersTotal=Całkowita liczba autorów
+svnrepository.committersToday=Autorów dzisiaj
+svnrepository.committersLast7Days=Liczba autorów w ostatnich 7 dniach
+svnrepository.committersLast31Days=Liczba autorów w ostatnich 31 dniach
+svnrepository.commitHistory=Historia zapisów
+
+legend.title=Legenda
+legend.old=Repozytorium nieaktywne
+
+lastupdate=Ostatnia aktualizacja
+
+action.refresh=Odśwież
+action.back=Wstecz
+action.show=Pokaż
+action.showAll=Pokaż wszystkie
Added: trunk/labs/kosmos/web-portlet/WEB-INF/classes/kosmos-taglib_pl.properties
===================================================================
--- trunk/labs/kosmos/web-portlet/WEB-INF/classes/kosmos-taglib_pl.properties 2005-12-10 14:41:56 UTC (rev 1775)
+++ trunk/labs/kosmos/web-portlet/WEB-INF/classes/kosmos-taglib_pl.properties 2005-12-10 17:37:55 UTC (rev 1776)
@@ -0,0 +1,8 @@
+# $Id$
+
+age.minutes=minuty
+age.hours=godziny
+age.days=dni
+age.weeks=tygodnie
+age.months=miesiące
+age.years=lata
|
Author: adamw
Date: 2005-12-10 09:41:56 -0500 (Sat, 10 Dec 2005)
New Revision: 1775
Modified:
trunk/forge/portal-extensions/forge-ads/project.xml
trunk/forge/portal-extensions/forge-blog/project.xml
trunk/forge/portal-extensions/forge-common/project.xml
trunk/forge/portal-extensions/forge-contributor/project.xml
trunk/forge/portal-extensions/forge-file-access/project.xml
trunk/forge/portal-extensions/forge-freezone/project.xml
trunk/forge/portal-extensions/forge-login-portlet/project.xml
trunk/forge/portal-extensions/forge-map/project.xml
trunk/forge/portal-extensions/forge-navigation/project.xml
trunk/forge/portal-extensions/forge-podcast/project.xml
trunk/forge/portal-extensions/forge-service/project.xml
trunk/forge/portal-extensions/forge-speller/project.xml
trunk/forge/portal-extensions/forge-status/project.xml
trunk/forge/portal-extensions/forge-wiki/project.xml
trunk/forge/portal-extensions/jbosswiki/forge-wiki/project.xml
trunk/forge/portal-extensions/jbosswiki/wiki-common/project.xml
trunk/forge/portal-extensions/jbosswiki/wiki-management/project.xml
trunk/forge/portal-extensions/polls/project.xml
trunk/forge/portal-extensions/portal-default/project.xml
trunk/forge/portal-extensions/primates/project.xml
trunk/forge/portal-extensions/shotoku/shotoku-aop/project.xml
trunk/forge/portal-extensions/shotoku/shotoku-test/project.xml
Log:
Build cleanup
Modified: trunk/forge/portal-extensions/forge-ads/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-ads/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-ads/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -16,21 +16,7 @@
</organization>
<description></description>
<dependencies>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>jboss-forge</groupId>
<artifactId>forge-common</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/forge-blog/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-blog/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-blog/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -34,20 +34,6 @@
</dependency>
<dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>aslibs</groupId>
<artifactId>javax.servlet</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/forge-common/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-common/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-common/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -25,13 +25,6 @@
</dependency>
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>aslibs</groupId>
<artifactId>javax.servlet</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/forge-contributor/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-contributor/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-contributor/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -17,21 +17,7 @@
<description></description>
<dependencies>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>jboss-forge</groupId>
<artifactId>forge-common</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/forge-file-access/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-file-access/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-file-access/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -17,13 +17,6 @@
<description></description>
<dependencies>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
<groupId>taglibs</groupId>
<artifactId>jstl</artifactId>
@@ -43,13 +36,6 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
-
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
<dependency>
<groupId>jboss-forge</groupId>
Modified: trunk/forge/portal-extensions/forge-freezone/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-freezone/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-freezone/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -17,21 +17,7 @@
<description></description>
<dependencies>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>jboss-forge</groupId>
<artifactId>forge-common</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/forge-login-portlet/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-login-portlet/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-login-portlet/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -30,25 +30,5 @@
<version>1.0</version>
<jar>javax.servlet.jar</jar>
</dependency>
-
-
-
- <!--
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
- -->
-
- <!--
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
- -->
</dependencies>
</project>
Modified: trunk/forge/portal-extensions/forge-map/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-map/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-map/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -17,21 +17,7 @@
<description></description>
<dependencies>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>jboss-forge</groupId>
<artifactId>forge-common</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/forge-navigation/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-navigation/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-navigation/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -17,21 +17,7 @@
<description></description>
<dependencies>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>jboss-forge</groupId>
<artifactId>forge-common</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/forge-podcast/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-podcast/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-podcast/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -17,21 +17,7 @@
<description></description>
<dependencies>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>jboss-forge</groupId>
<artifactId>forge-common</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/forge-service/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-service/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-service/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -126,26 +126,6 @@
</dependency>
<dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- <properties>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- <properties>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
- </properties>
- </dependency>
-
- <dependency>
<groupId>jboss-forge</groupId>
<artifactId>forge-common</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/forge-speller/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-speller/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-speller/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -30,21 +30,7 @@
</organization>
<description></description>
<dependencies>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.2</version>
Modified: trunk/forge/portal-extensions/forge-status/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-status/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-status/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -17,21 +17,7 @@
<description></description>
<dependencies>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>jboss-forge</groupId>
<artifactId>forge-common</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/forge-wiki/project.xml
===================================================================
--- trunk/forge/portal-extensions/forge-wiki/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/forge-wiki/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -55,22 +55,8 @@
<jar>javax.servlet.jsp.jar</jar>
</dependency>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
+ <dependency>
+ <groupId>jboss</groupId>
<artifactId>activation</artifactId>
<version>1.0</version>
<jar>activation.jar</jar>
Modified: trunk/forge/portal-extensions/jbosswiki/forge-wiki/project.xml
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/forge-wiki/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/jbosswiki/forge-wiki/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -55,21 +55,7 @@
<jar>javax.servlet.jsp.jar</jar>
</dependency>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>jboss</groupId>
<artifactId>activation</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/project.xml
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -55,21 +55,7 @@
<jar>javax.servlet.jsp.jar</jar>
</dependency>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>jboss</groupId>
<artifactId>activation</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-management/project.xml
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-management/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-management/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -58,21 +58,7 @@
<jar>javax.servlet.jsp.jar</jar>
</dependency>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>jboss</groupId>
<artifactId>activation</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/polls/project.xml
===================================================================
--- trunk/forge/portal-extensions/polls/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/polls/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -17,21 +17,7 @@
<description></description>
<dependencies>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>jboss-forge</groupId>
<artifactId>forge-common</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/portal-default/project.xml
===================================================================
--- trunk/forge/portal-extensions/portal-default/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/portal-default/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -17,18 +17,6 @@
<description></description>
<dependencies>
<dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
- <dependency>
<groupId>jboss-forge</groupId>
<artifactId>forge-common</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/primates/project.xml
===================================================================
--- trunk/forge/portal-extensions/primates/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/primates/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -16,21 +16,7 @@
</organization>
<description></description>
<dependencies>
- <dependency>
- <groupId>tmate</groupId>
- <artifactId>javasvn</artifactId>
- <version>1.0</version>
- <jar>javasvn.jar</jar>
- </dependency>
-
<dependency>
- <groupId>tmate</groupId>
- <artifactId>jsch</artifactId>
- <version>1.0</version>
- <jar>jsch.jar</jar>
- </dependency>
-
- <dependency>
<groupId>jboss-forge</groupId>
<artifactId>forge-common</artifactId>
<version>1.0</version>
Modified: trunk/forge/portal-extensions/shotoku/shotoku-aop/project.xml
===================================================================
--- trunk/forge/portal-extensions/shotoku/shotoku-aop/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/shotoku/shotoku-aop/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -6,7 +6,6 @@
-->
<project>
<pomVersion>3</pomVersion>
- <extend>../../empty.xml</extend>
<id>shotoku-aop</id>
<name>Shotoku base aop</name>
<currentVersion>1.0</currentVersion>
Modified: trunk/forge/portal-extensions/shotoku/shotoku-test/project.xml
===================================================================
--- trunk/forge/portal-extensions/shotoku/shotoku-test/project.xml 2005-12-10 13:43:39 UTC (rev 1774)
+++ trunk/forge/portal-extensions/shotoku/shotoku-test/project.xml 2005-12-10 14:41:56 UTC (rev 1775)
@@ -6,7 +6,6 @@
-->
<project>
<pomVersion>3</pomVersion>
- <extend>../../empty.xml</extend>
<id>shotoku-test</id>
<name>Shotoku test</name>
<currentVersion>1.0</currentVersion>
|
|
From: <jbo...@li...> - 2005-12-10 13:44:59
|
Author: adamw Date: 2005-12-10 08:43:39 -0500 (Sat, 10 Dec 2005) New Revision: 1774 Added: trunk/forge/portal-extensions/shotoku/build.properties.sample trunk/forge/portal-extensions/shotoku/lib/ trunk/forge/portal-extensions/shotoku/lib/jboss/ trunk/forge/portal-extensions/shotoku/lib/jboss/jars/ trunk/forge/portal-extensions/shotoku/lib/jboss/jars/activation.jar trunk/forge/portal-extensions/shotoku/lib/jboss/jars/javax.servlet.jar trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-annotations-ejb3.jar trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-aop.jar trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-ejb3.jar trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-ejb3x.jar trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-j2ee.jar trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-jmx.jar trunk/forge/portal-extensions/shotoku/lib/tmate/ trunk/forge/portal-extensions/shotoku/lib/tmate/jars/ trunk/forge/portal-extensions/shotoku/lib/tmate/jars/javasvn.jar Modified: trunk/forge/portal-extensions/shotoku/ trunk/forge/portal-extensions/shotoku/maven.xml trunk/forge/portal-extensions/shotoku/project.xml trunk/forge/portal-extensions/shotoku/shotoku-test/project.xml Log: http://jira.jboss.com/jira/browse/JBSHOTOKU-44 : build changes Property changes on: trunk/forge/portal-extensions/shotoku ___________________________________________________________________ Name: svn:ignore + build.properties Added: trunk/forge/portal-extensions/shotoku/build.properties.sample =================================================================== --- trunk/forge/portal-extensions/shotoku/build.properties.sample 2005-12-10 10:52:23 UTC (rev 1773) +++ trunk/forge/portal-extensions/shotoku/build.properties.sample 2005-12-10 13:43:39 UTC (rev 1774) @@ -0,0 +1,11 @@ +# Path to where JBoss AS is to be copied. +local.server.dir= + +# Path to where your portal extensions are to be deployed - you shouldn't +# have to change that. +local.deploy.dir=${local.server.dir}/server/all/deploy + +# Path to your local maven repository - you can comment this out if you use +# the default location. You can also create a build.properties in your home +# directory to set the maven.repo.local for all projects. +# maven.repo.local= Added: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/activation.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/activation.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/javax.servlet.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/javax.servlet.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-annotations-ejb3.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-annotations-ejb3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-aop.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-aop.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-ejb3.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-ejb3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-ejb3x.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-ejb3x.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-j2ee.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-j2ee.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-jmx.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/shotoku/lib/jboss/jars/jboss-jmx.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/forge/portal-extensions/shotoku/lib/tmate/jars/javasvn.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/portal-extensions/shotoku/lib/tmate/jars/javasvn.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/forge/portal-extensions/shotoku/maven.xml =================================================================== --- trunk/forge/portal-extensions/shotoku/maven.xml 2005-12-10 10:52:23 UTC (rev 1773) +++ trunk/forge/portal-extensions/shotoku/maven.xml 2005-12-10 13:43:39 UTC (rev 1774) @@ -4,7 +4,12 @@ See terms of license at gnu.org. --> <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util" xmlns:maven="jelly:maven"> - <goal name="all"> + <goal name="prj-clean"> + <ant:delete dir="${maven.build.dir}"/> + <ant:delete dir="${maven.build.dest}"/> + </goal> + + <goal name="all"> <attainGoal name="clean" /> <j:set var="prefix" value="" /> <j:set var="goal" value="build" /> @@ -29,6 +34,10 @@ </goal> <goal name="build"> + <ant:copy todir="${maven.repo.local}" overwrite="true"> + <ant:fileset dir="lib" /> + </ant:copy> + <j:set var="prefix" value="shotoku/" /> <j:set var="goal" value="build" /> <attainGoal name="shotoku-all-projects" /> @@ -39,7 +48,24 @@ <j:set var="goal" value="deploy" /> <attainGoal name="shotoku-all-projects" /> </goal> + + <goal name="shotoku:build"> + <ant:copy todir="${maven.repo.local}" overwrite="true"> + <ant:fileset dir="lib" /> + </ant:copy> + <j:set var="prefix" value="" /> + <j:set var="goal" value="build" /> + <attainGoal name="shotoku-all-projects" /> + </goal> + + <goal name="shotoku:deploy"> + <j:set var="prefix" value="" /> + <j:set var="goal" value="deploy" /> + <attainGoal name="shotoku-all-projects" /> + </goal> + + <goal name="clean"> <attainGoal name="prj-clean" /> <ant:delete dir="shotoku-base/target" /> Modified: trunk/forge/portal-extensions/shotoku/project.xml =================================================================== --- trunk/forge/portal-extensions/shotoku/project.xml 2005-12-10 10:52:23 UTC (rev 1773) +++ trunk/forge/portal-extensions/shotoku/project.xml 2005-12-10 13:43:39 UTC (rev 1774) @@ -6,7 +6,6 @@ --> <project> <pomVersion>3</pomVersion> - <extend>../empty.xml</extend> <id>shotoku</id> <name>Shotoku</name> <currentVersion>1.0</currentVersion> Modified: trunk/forge/portal-extensions/shotoku/shotoku-test/project.xml =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-test/project.xml 2005-12-10 10:52:23 UTC (rev 1773) +++ trunk/forge/portal-extensions/shotoku/shotoku-test/project.xml 2005-12-10 13:43:39 UTC (rev 1774) @@ -30,7 +30,7 @@ </dependency> <dependency> - <groupId>aslibs</groupId> + <groupId>jboss</groupId> <artifactId>javax.servlet</artifactId> <version>1.0</version> <jar>javax.servlet.jar</jar> |
Author: adamw Date: 2005-12-10 05:52:23 -0500 (Sat, 10 Dec 2005) New Revision: 1773 Modified: trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/Resource.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/AbstractSvnResource.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnFileDirectory.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnFileNode.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnHistoricNode.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnMemDirectory.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnMemNode.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnRepoDirectory.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnRepoNode.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnTools.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/PropertiesTest.java Log: http://jira.jboss.com/jira/browse/JBSHOTOKU-40 : Comment updates Modified: trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/ContentManager.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -45,6 +45,8 @@ /** * A base class which provides access to nodes and directories. + * <br /> + * <b>Warning:</b> all shotoku classes are not thread-safe. * * @author Adam Warski (ad...@as...) * @author Damon Sicore (da...@si...) Modified: trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/Resource.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/Resource.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/Resource.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -89,7 +89,9 @@ * persisted. * * @param propertyName - * Name of the property to set. + * Name of the property to set. It must begin with a character, + * and cannot contain any special characters (so the regexp to which + * a property name must match would be [a-z][a-z0-9]*). * @param propertyValue * Value of the property to set. */ Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/AbstractSvnResource.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/AbstractSvnResource.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/AbstractSvnResource.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -137,7 +137,7 @@ protected abstract String getPropertyInternal(String name); protected abstract String getLogMessageInternal(); - protected abstract Map<String, String> getAllPropertiesInternal(); + protected abstract Map<String, String> getPropertiesInternal(); protected abstract ResourceOperation getCopyOperation(SvnResource destination, String newName) throws SVNException; @@ -170,9 +170,10 @@ } public Map<String, String> getProperties() { - Map<String, String> ret = getAllPropertiesInternal(); + Map<String, String> ret = getPropertiesInternal(); + ret.putAll(modifiedProperties); - + return ret; } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnFileDirectory.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnFileDirectory.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnFileDirectory.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -52,7 +52,7 @@ } @Override - protected Map<String, String> getAllPropertiesInternal() { + protected Map<String, String> getPropertiesInternal() { return SvnTools.getAllProperties(file, getSvnCm()); } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnFileNode.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnFileNode.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnFileNode.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -58,7 +58,7 @@ } @Override - protected Map<String, String> getAllPropertiesInternal() { + protected Map<String, String> getPropertiesInternal() { return SvnTools.getAllProperties(file, getSvnCm()); } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnHistoricNode.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnHistoricNode.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnHistoricNode.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -72,7 +72,7 @@ } @Override - protected Map<String, String> getAllPropertiesInternal() { + protected Map<String, String> getPropertiesInternal() { return properties; } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnMemDirectory.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnMemDirectory.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnMemDirectory.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -98,7 +98,7 @@ } @Override - protected Map<String, String> getAllPropertiesInternal() { + protected Map<String, String> getPropertiesInternal() { // This resource isn't saved - so it has no properties. return new HashMap<String, String>(); } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnMemNode.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnMemNode.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnMemNode.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -69,7 +69,7 @@ } @Override - protected Map<String, String> getAllPropertiesInternal() { + protected Map<String, String> getPropertiesInternal() { // This resource isn't saved - so it has no properties. return new HashMap<String, String>(); } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnRepoDirectory.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnRepoDirectory.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnRepoDirectory.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -50,7 +50,7 @@ } @Override - protected Map<String, String> getAllPropertiesInternal() { + protected Map<String, String> getPropertiesInternal() { loadDirectoryContent(); return properties; } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnRepoNode.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnRepoNode.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnRepoNode.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -66,7 +66,7 @@ } @Override - protected Map<String, String> getAllPropertiesInternal() { + protected Map<String, String> getPropertiesInternal() { loadContentAndProperties(true); return properties; } @@ -96,8 +96,8 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); // revNo = -1 because we want the latest content. - SvnTools.getNodeContent(getFullPath(), -1, - getSvnCm(), baos, properties); + SvnTools.getNodeContent(getFullPath(), -1, getSvnCm(), baos, + properties); // Filtering out any svn: properties. for (Iterator<String> iter = properties.keySet().iterator(); Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnTools.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnTools.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnTools.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -46,10 +46,15 @@ import org.tmatesoft.svn.core.wc.SVNRevision; /** + * Common methods used by the ShotokuSvn classes. * @author Adam Warski (ad...@as...) * @author Damon Sicore (da...@si...) */ public class SvnTools { + /* + * Name of properties in the configuration file - all should be prefixed + * with "shotoku.<repository-id>.". + */ public static final String PROPERTY_USERNAME = "username"; public static final String PROPERTY_URL = "url"; public static final String PROPERTY_PASSWORD = "password"; @@ -57,14 +62,22 @@ private static SvnService instance; + /** + * Gets an instance of Shotoku svn service - this should be always the same + * the object, so the dirty sets work properly. + * @return An instance of org.jboss.shotoku.svn.SvnService + */ public static SvnService getService() { try { if (instance == null) { - if (Tools.isTrue(ContentManager.getProperty(Constants.PROPERTIES_EMBEDDED))) { + if (Tools.isTrue(ContentManager.getProperty( + Constants.PROPERTIES_EMBEDDED))) { + // Embedded mode - simply creating a new service instance. instance = new SvnServiceImpl(); instance.create(); instance.start(); } else { + // Application server mode - creating a proxy to a mbean. instance = (SvnService) MBeanProxyExt.create( SvnService.class, SvnService.SVN_SERVICE_NAME, Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -21,10 +21,14 @@ */ package org.jboss.shotoku.test; +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; import java.util.Arrays; import java.util.Calendar; +import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.Random; import java.util.Set; import org.jboss.shotoku.ContentManager; @@ -36,6 +40,7 @@ import org.jboss.shotoku.exceptions.ResourceAlreadyExists; import org.jboss.shotoku.exceptions.ResourceDoesNotExist; import org.jboss.shotoku.exceptions.SaveException; +import org.jboss.shotoku.svn.SvnContentManager; import org.jboss.shotoku.svn.SvnRevisionInfo; import org.jboss.shotoku.svn.SvnTools; import org.tmatesoft.svn.core.ISVNLogEntryHandler; @@ -443,11 +448,7 @@ private static void checkProperties(Node n) { Map<String, String> props = n.getProperties(); - System.out.println(3 == props.size()); - System.out.println("v1".equals(props.get("p1"))); - System.out.println("v2".equals(props.get("p2"))); - System.out.println("v3".equals(props.get("p3"))); - System.out.println(); + System.out.println(props.size()); } public static void propsTest() throws Exception { @@ -457,28 +458,50 @@ Node n = cm.getNode(TEST_FILE); - n.setProperty("p1", "v1"); - n.setProperty("p2", "v2"); - n.setProperty("p3", "v3"); + /*Random r = new Random(); + for (int i=0; i<3; i++) { + n.setProperty(Integer.toString(r.nextInt() % 3), Integer.toString(r.nextInt() % 2)); + }*/ + n.setProperty("0", "0"); + n.setProperty("1", "2"); n.save("a"); checkProperties(n); + checkProperties(cm.getNode(TEST_FILE)); // Waiting for a WC update. - Thread.sleep(1000 * 20); + Thread.sleep(1000 * 10); checkProperties(n); checkProperties(cm.getNode(TEST_FILE)); + } finally { cm.getNode(TEST_FILE).delete(); } } + private static void printMap(Map m) { + for (Object k : m.keySet()) { + System.out.println(k + " : " + m.get(k)); + } + + System.out.println(); + } + public static void main(String[] argv) throws Exception { long now = Calendar.getInstance().getTimeInMillis(); ContentManager.setup(); cm = ContentManager.getContentManager("shotoku-test"); + + /*Map<String, String> properties = new HashMap<String, String>(); + OutputStream os = new ByteArrayOutputStream(); + System.out.println("REV: " + ((SvnContentManager) cm).getRepository().getFile( + "default/polls/database/1289956185", -1, + properties, os)); + + printMap(properties);*/ + propsTest(); //testCopy(); //multiSaveTest(); Modified: trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/PropertiesTest.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/PropertiesTest.java 2005-12-09 23:23:49 UTC (rev 1772) +++ trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/PropertiesTest.java 2005-12-10 10:52:23 UTC (rev 1773) @@ -110,6 +110,7 @@ n.save("a"); checkProperties(n); + checkProperties(cm.getNode(TEST_FILE)); // Waiting for a WC update. Thread.sleep(1000 * 20); |
Author: unibrew
Date: 2005-12-09 18:23:49 -0500 (Fri, 09 Dec 2005)
New Revision: 1772
Modified:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollVotesDatabase.java
trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml
trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml
Log:
[JBLAB-407] Polls commiting.
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollVotesDatabase.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollVotesDatabase.java 2005-12-09 22:22:45 UTC (rev 1771)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollVotesDatabase.java 2005-12-09 23:23:49 UTC (rev 1772)
@@ -7,9 +7,11 @@
import org.jboss.shotoku.Directory;
import org.jboss.shotoku.Node;
import org.jboss.shotoku.aop.Inject;
+import org.jboss.shotoku.exceptions.DeleteException;
import org.jboss.shotoku.exceptions.RepositoryException;
import org.jboss.shotoku.exceptions.ResourceAlreadyExists;
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
+import org.jboss.shotoku.exceptions.SaveException;
public class PollVotesDatabase {
@@ -32,7 +34,10 @@
} catch (ResourceAlreadyExists e) {
System.out.println ("[POLLPORTLET] Database file for poll already exists!");
e.printStackTrace();
- } catch (RepositoryException e2) {
+ } catch (SaveException e) {
+ System.out.println ("[POLLS] Problem while saving property for database file.");
+ e.printStackTrace();
+ }catch (RepositoryException e2) {
System.out.println ("[POLLPORTLET] Problem with creating data file for poll!");
e2.printStackTrace();
}
@@ -50,6 +55,7 @@
public boolean votedOnPoll (String pollId, String userId, String vote) {
System.out.println ("SETTING PROPERTY FOR FILE");
+ System.out.println ("POLLID: "+pollId+" USERID: "+userId+" VOTE: "+vote);
Node pollFile=null;
try {
pollFile = databaseDir.getNode(pollId);
@@ -69,17 +75,28 @@
e3.printStackTrace();
}
}
+ System.out.println("PRZED DODANIEM GŁOSU "+pollFile.getClass().getCanonicalName());
pollFile.setProperty(userId,vote);
- pollFile.save("[Polls] Saving property for poll's database file.");
+ System.out.println("PO DODANIU GŁOSU PRZED SAVEM"+pollFile.getClass().getCanonicalName());
+ try {
+ pollFile.save("[Polls] Saving property for poll's database file.");
+ System.out.println("PO DODANU GŁOSU PO SAVIE"+pollFile.getClass().getCanonicalName());
+ } catch (SaveException e) {
+ System.out.println ("[POLLS] Problem while saving property for database file.");
+ e.printStackTrace();
+ }
return true;
}
public Map<String,String> getUserVotesForPollFile (String pollId) {
+ System.out.println ("GETUSERVOTESFORPOLLFILE POLLID: "+pollId);
Map<String,String> userVotes = null;
if (pollId==null) return new Hashtable<String,String>(0);
try {
Node pollFile = databaseDir.getNode(pollId);
+ System.out.println("PRZED GETPROPERTIES "+pollFile.getClass().getCanonicalName());
userVotes = pollFile.getProperties();
+ System.out.println("PO GETPROPERTIES "+pollFile.getClass().getCanonicalName());
System.out.println ("I'M BEFORE DISPLAYING FILE PROPERTIES.");
for (String first:userVotes.keySet()){
System.out.println("PROPERTY: "+first+" VALUE: "+userVotes.get(first));
@@ -101,10 +118,12 @@
Node pollFile = databaseDir.getNode(pollId);
pollFile.delete();
} catch (ResourceDoesNotExist e2) {
- System.out.println ("[PRIMATESPORTLET] Poll's data file was already deleted.");
+ System.out.println ("[POLLS] Poll's data file was already deleted.");
e2.printStackTrace();
- }
- catch (RepositoryException e) {
+ } catch (DeleteException e3) {
+ System.out.println ("[POLLS] Problem with deleting database file.");
+ e3.printStackTrace();
+ } catch (RepositoryException e) {
System.out.println ("[POLLPORTLET] Problem while deleting poll's data file.");
e.printStackTrace();
}
Modified: trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml
===================================================================
--- trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml 2005-12-09 22:22:45 UTC (rev 1771)
+++ trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml 2005-12-09 23:23:49 UTC (rev 1772)
@@ -25,6 +25,11 @@
</module>
<module>
<web>
+ <web-uri>polls-portlet.war</web-uri>
+ </web>
+ </module>
+ <module>
+ <web>
<web-uri>kosmos-server.war</web-uri>
</web>
</module>
Modified: trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml
===================================================================
--- trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml 2005-12-09 22:22:45 UTC (rev 1771)
+++ trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml 2005-12-09 23:23:49 UTC (rev 1772)
@@ -300,9 +300,16 @@
<window-name>DownloadCounterPortletWindowDefaultDownloads</window-name>
<instance-ref>counter.DownloadCounterPortlet.DownloadCounterPortletInstance</instance-ref>
<region>center</region>
- <height>0</height>
+ <height>1</height>
<window-state>normal</window-state>
</window>
+ <window>
+ <window-name>PollsPortletWindowDefaultDownloads</window-name>
+ <instance-ref>polls.PollsPortlet.PollsPortletInstance</instance-ref>
+ <region>center</region>
+ <height>2</height>
+ <window-state>normal</window-state>
+ </window>
</page>
<page>
|
|
From: <jbo...@li...> - 2005-12-09 22:22:56
|
Author: szimano
Date: 2005-12-09 17:22:45 -0500 (Fri, 09 Dec 2005)
New Revision: 1771
Modified:
trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java
Log:
updated shotoku data source file after adam's changes
Modified: trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java
===================================================================
--- trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java 2005-12-09 22:09:34 UTC (rev 1770)
+++ trunk/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/ShotokuDataSource.java 2005-12-09 22:22:45 UTC (rev 1771)
@@ -38,6 +38,7 @@
import org.jboss.shotoku.exceptions.RepositoryException;
import org.jboss.shotoku.exceptions.ResourceAlreadyExists;
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
+import org.jboss.shotoku.exceptions.SaveException;
import org.jboss.wiki.exceptions.DataSourceException;
import org.jboss.wiki.exceptions.PageRenamingException;
@@ -353,10 +354,19 @@
pageFileWriter.close();
status = true;
- pageOldFile.save("Adding version " + page.getLastVersion()
- + " of page " + uid);
- pageFile.save("Adding version " + page.getLastVersion()
- + " of page " + uid);
+ try {
+ pageOldFile.save("Adding version " + page.getLastVersion()
+ + " of page " + uid);
+ pageFile.save("Adding version " + page.getLastVersion()
+ + " of page " + uid);
+ } catch (RepositoryException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (SaveException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
} catch (IOException ioe) {
log.error("[ShotokuDataSource]: Cannot save page: ", ioe);
@@ -395,8 +405,16 @@
e2.printStackTrace();
}
- pageDir.save("Adding version " + page.getLastVersion()
- + " of page " + uid);
+ try {
+ pageDir.save("Adding version " + page.getLastVersion()
+ + " of page " + uid);
+ } catch (RepositoryException e3) {
+ // TODO Auto-generated catch block
+ e3.printStackTrace();
+ } catch (SaveException e3) {
+ // TODO Auto-generated catch block
+ e3.printStackTrace();
+ }
Node newPagePropsFile = null;
try {
@@ -449,8 +467,16 @@
}
- pageDir.save("Adding version " + page.getLastVersion() + " of page "
- + uid);
+ try {
+ pageDir.save("Adding version " + page.getLastVersion() + " of page "
+ + uid);
+ } catch (RepositoryException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ } catch (SaveException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
Node pageFile = null;
try {
@@ -475,10 +501,19 @@
status = true;
- newPagePropsFile.save("Adding version " + page.getLastVersion()
- + " of page " + uid);
- pageFile.save("Adding version " + page.getLastVersion()
- + " of page " + uid);
+ try {
+ newPagePropsFile.save("Adding version " + page.getLastVersion()
+ + " of page " + uid);
+ pageFile.save("Adding version " + page.getLastVersion()
+ + " of page " + uid);
+ } catch (RepositoryException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (SaveException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
} catch (IOException e) { log.error("Cannot write new page: ", e);
@@ -497,7 +532,15 @@
}
public void savePageProps(String pageName, Node pagePropsNode) {
- pagePropsNode.save("Saving page props for page: " + pageName);
+ try {
+ pagePropsNode.save("Saving page props for page: " + pageName);
+ } catch (RepositoryException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (SaveException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
private Node getPropsNode(String pageName) {
@@ -544,8 +587,16 @@
pageProps.setProperty("1.author", "unknown");
pageProps.store(fpo, SAVE_COMMENT);
fpo.close();
- pagePropsFile.save("genarating page props for page: "
- + pageName);
+ try {
+ pagePropsFile.save("genarating page props for page: "
+ + pageName);
+ } catch (RepositoryException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (SaveException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
} catch (IOException e) {
@@ -584,7 +635,15 @@
// TODO Auto-generated catch block
e1.printStackTrace();
}
- pageDir.save("adding "+attName+" directory for page: "+pageName);
+ try {
+ pageDir.save("adding "+attName+" directory for page: "+pageName);
+ } catch (RepositoryException e2) {
+ // TODO Auto-generated catch block
+ e2.printStackTrace();
+ } catch (SaveException e2) {
+ // TODO Auto-generated catch block
+ e2.printStackTrace();
+ }
try {
propNode = pageDir.newNode(
@@ -630,7 +689,15 @@
+ propsNode.getFullName(), ioe);
}
- propsNode.save("Saving props for attachment "+propsNode.getFullName());
+ try {
+ propsNode.save("Saving props for attachment "+propsNode.getFullName());
+ } catch (RepositoryException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (SaveException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
public WikiPage getPage(String pageName) {
@@ -897,7 +964,15 @@
saveAttProps(propsNode, attProps);
- newFileNode.save("Adding attachment: "+attName+" for page: "+page.getName());
+ try {
+ newFileNode.save("Adding attachment: "+attName+" for page: "+page.getName());
+ } catch (RepositoryException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (SaveException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
public Set<String> getAttachmentsSet(WikiPage page) {
|
|
From: <jbo...@li...> - 2005-12-09 22:09:42
|
Author: unibrew
Date: 2005-12-09 17:09:34 -0500 (Fri, 09 Dec 2005)
New Revision: 1770
Added:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollVotesDatabase.java
Modified:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Poll.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsDescriptor.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsWatcher.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
Log:
[JBLAB-407] Updating files for PollsPortlet.
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Poll.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Poll.java 2005-12-09 22:08:33 UTC (rev 1769)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Poll.java 2005-12-09 22:09:34 UTC (rev 1770)
@@ -2,18 +2,21 @@
public class Poll {
- String question;
- long positive;
- long negative;
+ private String question;
+ private long positive;
+ private long negative;
+ private String pollId;
- public Poll (long positive, long negative, String question) {
+ public Poll (long positive, long negative, String question, String pollId) {
this.positive = positive;
this.negative = negative;
this.question = question;
+ this.pollId = pollId;
}
public Poll (String question) {
this.question = question;
+ this.pollId= Integer.toString((int)(Math.random()*Integer.MAX_VALUE));
}
public void incrementPositive () {
@@ -40,6 +43,10 @@
public String getQuestion() {
return question;
}
+
+ public String getPollId() {
+ return pollId;
+ }
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java 2005-12-09 22:08:33 UTC (rev 1769)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java 2005-12-09 22:09:34 UTC (rev 1770)
@@ -24,8 +24,16 @@
package org.jboss.forge.common.projects;
import java.io.File;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.portlet.PortletURL;
+
import org.jboss.forge.common.ForgeHelper;
import org.jboss.portal.common.context.Context;
import org.jboss.portal.common.context.DelegateContext;
@@ -50,6 +58,11 @@
public static final String POLLS_VOTING_JSP="polls_voting.jsp";
/**
+ * Name of JSP view file prepared for displaying detailed voting stats.
+ */
+ public static final String POLLS_DETAILS_JSP="polls_details.jsp";
+
+ /**
* Private constructor made in order to prevent from creating
* PollTools object.
*/
@@ -106,6 +119,17 @@
/**
* Method constructs path to the PollPortlet JSP view file containing
+ * detailed information about who and how has voted on specified poll.
+ *
+ * @param portalName
+ * @return Path to the PollPortlet's JSP voting detailed info view file.
+ */
+ public static String getDetailsJsp() {
+ return POLLS_DIR + File.separator + POLLS_DETAILS_JSP;
+ }
+
+ /**
+ * Method constructs path to the PollPortlet JSP view file containing
* voting question.
*
* @param portalName
@@ -117,13 +141,110 @@
public static Context getInfoContext (String portalName,String projectId,
ContentManager cm,JBossRenderResponse response) {
+ // If the projectId is null method returns empty DelegateContext object.
+ if (projectId==null) {
+ return new DelegateContext();
+ }
- return new DelegateContext();
+ // Creating new empty context.
+ DelegateContext ctx = new DelegateContext();
+
+ // Getting the PollsDescriptor object containing counters.
+ PollsDescriptor desc = getDesc(portalName,cm);
+
+ // If there isn't a descriptor in cache, return empty context.
+ if (desc==null) {
+ return ctx;
+ }
+
+ // If there is no tracked link for projectId return empty context.
+ if (!desc.checkForProjectPolls(projectId)) {
+ return ctx;
+ }
+
+ // Getting the polls for given projectId.
+ Map<String,Poll> values = desc.getPollsStatsForProject(projectId);
+
+ // Filling the context for portlet.
+ DelegateContext polls = ctx.next("polls");
+ Poll temporary=null;
+ for (String pollId:values.keySet()) {
+ PortletURL url = response.createRenderURL();
+ DelegateContext poll = polls.next("poll");
+ temporary = values.get(pollId);
+ poll.put("question",temporary.getQuestion());
+ poll.put("renderUrl",url.toString());
+ url.setParameter("pollId",pollId);
+ url.setParameter("details","true");
+ poll.put("renderUrlDetailed",url.toString());
+ poll.put("positive",Long.toString(temporary.getPositive()));
+ poll.put("negative",Long.toString(temporary.getNegative()));
+ }
+ return ctx;
+
}
+ public static Context getDetailsContext (String portalName,String projectId,String pollId,
+ ContentManager cm,JBossRenderResponse response) {
+ // If the projectId is null method returns empty DelegateContext object.
+ if (projectId==null) {
+ return new DelegateContext();
+ }
+
+ // Creating new empty context.
+ DelegateContext ctx = new DelegateContext();
+
+ // Getting the PollsDescriptor object containing counters.
+ PollsDescriptor desc = getDesc(portalName,cm);
+
+ // If there isn't a descriptor in cache, return empty context.
+ if (desc==null) {
+ return ctx;
+ }
+
+ // If there is no tracked link for projectId return empty context.
+ if (!desc.checkForProjectPolls(projectId)) {
+ return ctx;
+ }
+
+ // Getting the polls for given projectId.
+ Map<String,String> values = desc.getDetailStatsForPoll(pollId);
+
+ //Sumarizing negative and positive votes to separate lists.
+ Set<String> positiveVotes = new HashSet<String>();
+ Set<String> negativeVotes = new HashSet<String>();
+ for (String userId : values.keySet()) {
+ if (values.get(userId).equals(PollsDescriptor.POSITIVE_VOTE)) {
+ positiveVotes.add(userId);
+ } else if (values.get(userId).equals(PollsDescriptor.NEGATIVE_VOTE)) {
+ negativeVotes.add(userId);
+ }
+ }
+
+ // Filling the context for portlet.
+ DelegateContext poll = ctx.next("poll");
+
+ Poll tempPoll = desc.getPoll(projectId,pollId);
+ poll.put("question",tempPoll!=null?tempPoll.getQuestion():"");
+ poll.put("renderUrl",response.createRenderURL().toString());
+
+ Iterator posIt = positiveVotes.iterator();
+ Iterator negIt = negativeVotes.iterator();
+
+ while (posIt.hasNext() || negIt.hasNext()) {
+ DelegateContext votes = poll.next("votes");
+ votes.put("positiveUser",posIt.hasNext()?(String)posIt.next():"");
+ votes.put("negativeUser",negIt.hasNext()?(String)negIt.next():"");
+ }
+
+ return ctx;
+
+ }
+
+
public static Context getVotingContext (String portalName, String projectId,
ContentManager cm,JBossRenderResponse response) {
-// If the projectId is null method returns empty DelegateContext object.
+ // If the projectId is null method returns empty DelegateContext object.
if (projectId==null) {
return new DelegateContext();
}
@@ -145,19 +266,17 @@
}
// Getting the polls for given projectId.
- List<Poll> values = desc.getPollsMap().get(projectId);
+ Map<String,String> values = desc.getPollsInfoForProject(projectId);
// Filling the context for portlet.
DelegateContext polls = ctx.next("polls");
- for (Poll pollElem:values) {
+ for (String pollId:values.keySet()) {
DelegateContext poll = polls.next("poll");
-
- // Resolving the question
- String question = pollElem.getQuestion();
-
- poll.put("question",question);
- poll.put("actionurl",response.createActionURL().toString());
+
+ poll.put("question",values.get(pollId));
+ poll.put("actionUrl",response.createActionURL().toString());
+ poll.put("pollId",pollId);
}
return ctx;
}
Added: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollVotesDatabase.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollVotesDatabase.java 2005-12-09 22:08:33 UTC (rev 1769)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollVotesDatabase.java 2005-12-09 22:09:34 UTC (rev 1770)
@@ -0,0 +1,113 @@
+package org.jboss.forge.common.projects;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+import org.jboss.shotoku.ContentManager;
+import org.jboss.shotoku.Directory;
+import org.jboss.shotoku.Node;
+import org.jboss.shotoku.aop.Inject;
+import org.jboss.shotoku.exceptions.RepositoryException;
+import org.jboss.shotoku.exceptions.ResourceAlreadyExists;
+import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
+
+public class PollVotesDatabase {
+
+ public static final String DATABASE_LOCATION = "default/polls/database/";
+
+ Directory databaseDir;
+
+ @Inject
+ ContentManager contentManager;
+
+ public PollVotesDatabase() throws ResourceDoesNotExist {
+ databaseDir =contentManager.getDirectory(DATABASE_LOCATION);
+ }
+
+ public void createNewPollFile (String fileName) {
+ try {
+ System.out.println ("POLLVOTESDATABASE CREATENEWPOLL");
+ Node node = databaseDir.newNode(fileName);
+ node.save("[Polls] Creating new poll's database file.");
+ } catch (ResourceAlreadyExists e) {
+ System.out.println ("[POLLPORTLET] Database file for poll already exists!");
+ e.printStackTrace();
+ } catch (RepositoryException e2) {
+ System.out.println ("[POLLPORTLET] Problem with creating data file for poll!");
+ e2.printStackTrace();
+ }
+ }
+
+
+ public boolean checkForPollFile(String pollId) {
+ try {
+ databaseDir.getNode(pollId);
+ } catch (ResourceDoesNotExist e) {
+ return false;
+ }
+ return true;
+ }
+
+ public boolean votedOnPoll (String pollId, String userId, String vote) {
+ System.out.println ("SETTING PROPERTY FOR FILE");
+ Node pollFile=null;
+ try {
+ pollFile = databaseDir.getNode(pollId);
+ String voteValue = pollFile.getProperty(userId);
+ if (voteValue!= null && !voteValue.equals(""))
+ return false;
+ } catch (RepositoryException e) {
+ System.out.println ("[POLLS] RepositoryException while getting properties for Node.");
+ e.printStackTrace();
+ return false;
+ } catch (ResourceDoesNotExist e2) {
+ System.out.println("[POLLPORTLET] Database file for poll didn't exist!");
+ e2.printStackTrace();
+ try {
+ databaseDir.newNode(pollId);
+ } catch (ResourceAlreadyExists e3) {
+ e3.printStackTrace();
+ }
+ }
+ pollFile.setProperty(userId,vote);
+ pollFile.save("[Polls] Saving property for poll's database file.");
+ return true;
+ }
+
+ public Map<String,String> getUserVotesForPollFile (String pollId) {
+ Map<String,String> userVotes = null;
+ if (pollId==null) return new Hashtable<String,String>(0);
+ try {
+ Node pollFile = databaseDir.getNode(pollId);
+ userVotes = pollFile.getProperties();
+ System.out.println ("I'M BEFORE DISPLAYING FILE PROPERTIES.");
+ for (String first:userVotes.keySet()){
+ System.out.println("PROPERTY: "+first+" VALUE: "+userVotes.get(first));
+ }
+ } catch (RepositoryException e) {
+ System.out.println ("[POLLS] RepositoryException while getting properties for Node.");
+ e.printStackTrace();
+ return new Hashtable<String,String>(0);
+ } catch (ResourceDoesNotExist e2) {
+ System.out.println("[POLLPORTLET] Database file for poll didn't exist!");
+ e2.printStackTrace();
+ return new Hashtable<String,String>(0);
+ }
+ return userVotes;
+ }
+
+ public void removePollDataFile (String pollId) {
+ try {
+ Node pollFile = databaseDir.getNode(pollId);
+ pollFile.delete();
+ } catch (ResourceDoesNotExist e2) {
+ System.out.println ("[PRIMATESPORTLET] Poll's data file was already deleted.");
+ e2.printStackTrace();
+ }
+ catch (RepositoryException e) {
+ System.out.println ("[POLLPORTLET] Problem while deleting poll's data file.");
+ e.printStackTrace();
+ }
+ }
+
+}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsDescriptor.java 2005-12-09 22:08:33 UTC (rev 1769)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsDescriptor.java 2005-12-09 22:09:34 UTC (rev 1770)
@@ -56,6 +56,16 @@
public static final String NEGATIVE_VOTES = "negative";
/**
+ * String which describes positive vote.
+ */
+ public static final String POSITIVE_VOTE = "1";
+
+ /**
+ * String which describes negative vote.
+ */
+ public static final String NEGATIVE_VOTE = "0";
+
+ /**
* Name of tag in polls descriptor containing poll's question.
*/
public static final String QUESTION = "question";
@@ -76,6 +86,11 @@
public static final String POLL = "poll";
/**
+ * Name of a tag containing unique id of a poll.
+ */
+ public static final String POLL_ID = "id";
+
+ /**
* This Map contains all polls for the portal.
* Keys are project id names and values are Lists of polls defined for that project.
*/
@@ -86,6 +101,8 @@
*/
private ContentManager contentManager;
+ private PollVotesDatabase database;
+
/**
* This boolean variable turns to true if one of the polls
* has been incremented. If value is true the polls Map
@@ -114,6 +131,9 @@
this.contentManager = contentManager;
try {
+
+ // Constructing object used for getting to Poll's database.
+ database = new PollVotesDatabase();
// Parsing main download counters descriptor.
DOMParser parser = new DOMParser();
@@ -136,15 +156,39 @@
}
}
- /** GOTOWA!!!
- * Method only returns all polls.
- * @return Returns a Map containing polls.
- */
- public Map<String,List<Poll>> getPollsMap () {
- return polls;
+ public synchronized Map<String,String> getPollsInfoForProject(String projectId) {
+ List<Poll> polls = getProjectPolls(projectId);
+ Hashtable<String,String> values = null;
+ if (polls!=null) {
+ values = new Hashtable<String,String>(polls.size());
+ for (Poll poll:polls) {
+ values.put(poll.getPollId(),poll.getQuestion());
+ }
+
+ } else {
+ values = new Hashtable<String,String>();
+ }
+ return values;
}
+ public synchronized Map<String,Poll> getPollsStatsForProject(String projectId) {
+ List<Poll> polls = getProjectPolls(projectId);
+ Map<String,Poll> values = null;
+ if (polls!=null) {
+ values = new Hashtable<String,Poll>(polls.size());
+ for (Poll poll:polls){
+ values.put(poll.getPollId(),poll);
+ }
+ } else {
+ values = new Hashtable<String,Poll>();
+ }
+ return values;
+ }
+ public Map<String,String> getDetailStatsForPoll (String pollId) {
+ return database.getUserVotesForPollFile(pollId);
+ }
+
/** GOTOWA!!!
* This method searches through projects direcories in order to find all poll descriptors.
* Method returns Map containing pairs of String projectId and
@@ -198,6 +242,10 @@
*/
private void synchronizePolls (Map<String,org.jboss.shotoku.Node> projectPolls) {
+ // Checking if tracked projects still have their poll.xml descriptors.
+ // If not deleting all tracked links for them.
+ removeNotTrackedProjects(projectPolls.keySet());
+
// Iterating through projects nodes containing poll descriptors.
for (String projectId:projectPolls.keySet()){
try {
@@ -208,6 +256,10 @@
// Getting list of polls from polls Map for a given projectId name.
List<Poll> xmlProjectPolls = getProjectPolls(projectId);
+ if (xmlProjectPolls==null) {
+ xmlProjectPolls= new LinkedList<Poll>();
+ }
+
// Getting the list of polls from project's poll descriptor.
List<Poll> descPolls = pollDesc.getPolls();
@@ -241,6 +293,24 @@
changeStatus=false;
}
+ private synchronized void removeNotTrackedProjects(Set<String> projectIds) {
+ polls.keySet().retainAll(projectIds);
+ }
+
+ public synchronized Poll getPoll (String projectId,String pollId) {
+ if (projectId!=null && pollId!=null &&
+ !projectId.equals("") && !pollId.equals("") && polls!=null) {
+ List<Poll> list = polls.get(projectId);
+ if (list==null) return null;
+ for (Poll poll : list) {
+ if (poll.getPollId().equals(pollId)) {
+ return poll;
+ }
+ }
+ }
+ return null;
+ }
+
/** GOTOWA!!!
* Method removes polls specified in <code>pollsToDelete</code>
* from tracking their votes.
@@ -251,6 +321,7 @@
private synchronized void removePollsFromVoting (List<Poll> pollsToDelete) {
// Removing polls which shouldn't be tracked any more.
for (Poll poll:pollsToDelete) {
+ database.removePollDataFile(poll.getPollId());
polls.remove(poll);
}
}
@@ -271,6 +342,7 @@
for (Poll poll:newPolls) {
if (!polls.get(projectId).contains(poll)){
polls.get(projectId).add(poll);
+ database.createNewPollFile(poll.getPollId());
}
}
}
@@ -295,7 +367,7 @@
public void synchronizeWithFile(String portalName) {
String pathToPollsXml = File.separator + PollTools.getMainXmlPath(portalName);
-
+ System.out.println ("SYNCHRONIZING MAIN XML FILE");
try {
DOMParser parser = new DOMParser();
@@ -320,7 +392,7 @@
org.jboss.shotoku.Node xmlFile = contentManager.getNode(pathToPollsXml);
xmlFile.setContent(xmlString);
xmlFile.save ("[Polls] Main xml descriptor file update.");
-
+ System.out.println ("AFTER SYNCHRONIZING MAIN XML FILE");
} catch (Exception e) {
e.printStackTrace();
}
@@ -339,7 +411,9 @@
Node newProject = doc.createElement(PROJECT);
Node projectAttribute = doc.createAttribute(PROJECT_ID);
projectAttribute.appendChild(doc.createTextNode(projectId));
- newProject.appendChild(projectAttribute);
+ //newProject.appendChild(projectAttribute);
+ newProject.getAttributes().setNamedItem(projectAttribute);
+
for (Poll poll:polls.get(projectId)) {
Node newPoll = doc.createElement(POLL);
@@ -354,11 +428,16 @@
Node newNegativeVotes = doc.createElement(NEGATIVE_VOTES);
Node newNegativeVotesText = doc.createTextNode(Long.toString(poll.getNegative()));
newNegativeVotes.appendChild(newNegativeVotesText);
-
+
+ Node newPollId = doc.createElement(POLL_ID);
+ Node newPollIdText = doc.createTextNode(poll.getPollId());
+ newPollId.appendChild(newPollIdText);
+
newPoll.appendChild(newQuestion);
newPoll.appendChild(newPositiveVotes);
newPoll.appendChild(newNegativeVotes);
-
+ newPoll.appendChild(newPollId);
+
newProject.appendChild(newPoll);
}
@@ -369,43 +448,72 @@
/** GOTOWA!!!
* Method simply just increments the positive counter value for
* given in parameters <code>projectId question</code>.
- *
- * @param question
- * Poll's question.
+ * @param userId
+ * User login name.
+ * @param pollId
+ * Poll's id number.
* @param projectId
* Project id name for which is this question.
*/
- synchronized public void incrementPositive (String question,String projectId) {
+ synchronized public boolean votePositive (String pollId,String userId, String projectId) {
+ System.out.println ("TRYING TO VOTE");
List<Poll> projectPolls = polls.get(projectId);
if (projectPolls!=null) {
- int position = projectPolls.indexOf(new Poll(question));
- if (position!=-1) {
+ Poll poll = null;
+ for (Poll p : projectPolls) {
+ if (p.getPollId().equals(pollId)) {
+ poll = p;
+ break;
+ }
+ }
+ if (!database.votedOnPoll(pollId,userId,POSITIVE_VOTE)) {
+ return false;
+ }
+ if (poll!=null) {
+ System.out.println ("VOTING AND CHANGING STATUS");
// Status change to inform about counters modification.
changeStatus=true;
- projectPolls.get(position).incrementPositive();
+ poll.incrementPositive();
+ return true;
}
}
+ return false;
}
/** GOTOWA!!!
* Method simply just increments the negative counter value for
* given in parameters <code>projectId question</code>.
*
- * @param question
- * Poll's question.
+ * @param userId
+ * User login name.
+ * @param pollId
+ * Poll's id number.
* @param projectId
* Project id name for which is this question.
*/
- synchronized public void incrementNegative (String question,String projectId) {
+ synchronized public boolean voteNegative (String pollId,String userId,String projectId) {
+ System.out.println ("TRYING TO VOTE");
List<Poll> projectPolls = polls.get(projectId);
if (projectPolls!=null) {
- int position = projectPolls.indexOf(new Poll(question));
- if (position!=-1) {
+ Poll poll = null;
+ for (Poll p : projectPolls) {
+ if (p.getPollId().equals(pollId)) {
+ poll = p;
+ break;
+ }
+ }
+ if (!database.votedOnPoll(pollId,userId,NEGATIVE_VOTE)) {
+ return false;
+ }
+ if (poll!=null) {
+ System.out.println ("VOTING AND CHANGING STATUS");
// Status change to inform about counters modification.
changeStatus=true;
- projectPolls.get(position).incrementNegative();
+ poll.incrementNegative();
+ return true;
}
}
+ return false;
}
@@ -442,7 +550,7 @@
* @return
* Map<String,List<Poll>> containing polls read from the xml nodes.
*/
- private static Map<String,List<Poll>> getValuesFromNodes (NodeList nodes) {
+ private Map<String,List<Poll>> getValuesFromNodes (NodeList nodes) {
Map<String,List<Poll>> values = new Hashtable<String,List<Poll>>();
// Temporary variables used for parsing.
@@ -457,6 +565,7 @@
String tempQuestion = null;
String tempPositiveVotes = null;
String tempNegativeVotes = null;
+ String tempPollId = null;
for (int j=0;j< pollNodes.getLength() ; j++) {
pollNode = pollNodes.item(j);
if (pollNode.getNodeType()== Node.ELEMENT_NODE && pollNode.getNodeName().equals(POLL)){
@@ -471,16 +580,27 @@
tempPositiveVotes = nodeTextCnt.trim();
} else if (property.getNodeName().equals(NEGATIVE_VOTES) && nodeTextCnt !=null && !nodeTextCnt.trim().equals("")) {
tempNegativeVotes = nodeTextCnt.trim();
+ } else if (property.getNodeName().equals(POLL_ID) && nodeTextCnt !=null && !nodeTextCnt.trim().equals("")) {
+ tempPollId = nodeTextCnt.trim();
}
}
}
}
}
- if (tempProjectId!=null && tempQuestion!=null && tempPositiveVotes!=null && tempNegativeVotes!=null) {
+ if (tempProjectId!=null && tempQuestion!=null && tempPositiveVotes!=null
+ && tempNegativeVotes!=null && tempPollId!=null) {
if (values.get(tempProjectId)==null) {
values.put(tempProjectId,new ArrayList<Poll>());
}
- values.get(tempProjectId).add(new Poll(tempQuestion));
+ values.get(tempProjectId).add(
+ new Poll(Long.valueOf(tempPositiveVotes),
+ Long.valueOf(tempNegativeVotes),tempQuestion,tempPollId));
+ System.out.println ("JESTEM PRZED CREATE");
+ if (!database.checkForPollFile(tempPollId)) {
+ System.out.println ("JESTEM W CREATE");
+ database.createNewPollFile(tempPollId);
+ }
+ System.out.println ("JESTEM PO CREATE");
}
}
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsWatcher.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsWatcher.java 2005-12-09 22:08:33 UTC (rev 1769)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsWatcher.java 2005-12-09 22:09:34 UTC (rev 1770)
@@ -24,6 +24,7 @@
package org.jboss.forge.common.projects;
import java.util.Collection;
+import java.util.Set;
import org.jboss.forge.common.service.NodeWatcher;
import org.jboss.forge.common.service.ResourceWatcher;
@@ -36,6 +37,11 @@
ResourceWatcher rw;
/**
+ * This Collection contains names of projects which contain poll.xml descriptors.
+ */
+ Set<String> pollDescriptors;
+
+ /**
* Simple constructor saving ContentManager given in parameter
* <code>conentManager</code>
* @param contentManager
@@ -61,14 +67,14 @@
new PollsDescriptor(portalName, contentManager);
rw = new ResourceWatcher(contentManager);
// Registering ResourceWatcher to watch for main polls descriptor file change.
- rw.watchResource(DownloadCounterTools.getMainXmlPath(portalName));
+ rw.watchResource(PollTools.getMainXmlPath(portalName));
// Getting the project ids names where are poll descriptors.
- Collection<String> projects = descriptor.getPollDescriptors(portalName).keySet();
+ pollDescriptors = descriptor.getPollDescriptors(portalName).keySet();
// Adding found project poll descriptors to the ResourceWatcher to watch
// for their changes.
- for (String id:projects) {
+ for (String id:pollDescriptors) {
rw.watchResource(PollTools.getProjectXmlPath(portalName,id));
}
return descriptor;
@@ -79,17 +85,26 @@
* If the object is changed the method returns new object if not returns null.
*/
public Object nodeUpdate(String portalName, Object currentValue) {
- if (currentValue==null || rw.checkResources()) {
+ System.out.println ("IN UPDATE CHANGE STATUS: "+((PollsDescriptor)currentValue).hasChanged());
+ if (currentValue==null || rw.checkResources()
+ || !checkForNewResources((PollsDescriptor)currentValue,portalName)) {
+ System.out.println("CREATING NEW DESCRIPTOR OBJECT.");
return getDescriptor(portalName);
} else if (((PollsDescriptor)currentValue).hasChanged()){
+ System.out.println ("I'M IN POLLWATCHER MAIN XML UPDATE.");
PollsDescriptor descriptor =
(PollsDescriptor)currentValue;
descriptor.synchronizeWithFile(portalName);
+ System.out.println ("I'M IN POLLWATCHER AFTER MAIN XML UPDATE.");
return null;
}
+ System.out.println ("AT THE END OF NODEUPDATE");
return null;
}
+ private boolean checkForNewResources (PollsDescriptor desc, String portalName) {
+ return pollDescriptors.containsAll(desc.getPollDescriptors(portalName).keySet());
+ }
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2005-12-09 22:08:33 UTC (rev 1769)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2005-12-09 22:09:34 UTC (rev 1770)
@@ -25,7 +25,9 @@
import java.util.Map;
import org.jboss.forge.common.ForgeHelper;
+import org.jboss.forge.common.projects.permissions.ActionRequestPermissionsChecker;
import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker;
+import org.jboss.portlet.JBossActionRequest;
import org.jboss.portlet.JBossRenderRequest;
/**
@@ -159,6 +161,46 @@
return projectId;
}
+
+ /**
+ * Equivalent to <code>getSelectedProjectId(request, false)</code>.
+ * @param request
+ * A request object from which the selected project name will be
+ * read.
+ * @return Selected project's id, or null, if no project is selected (never
+ * the default project, as it cannot be selected).
+ */
+ public static String getSelectedProjectId(JBossActionRequest request) {
+ return getSelectedProjectId(request, false);
+ }
+
+ /**
+ * @param request
+ * A request object from which the selected project name will be
+ * read.
+ * @param withDefault
+ * True if default project name should be returned if no project
+ * is selected. False if null should be returned in such case.
+ * @return Selected project's id, or the default project's id/ null, depending
+ * on <code>withDefault</code>, if no project is selected.
+ */
+ public static String getSelectedProjectId(JBossActionRequest request,
+ boolean withDefault) {
+ String projectId = request.getParameter(PROJECT_URL_PARAM);
+
+ if ((withDefault) && (projectId == null)) {
+ projectId = DEFAULT_PROJECT;
+ } else if ((!withDefault) && (DEFAULT_PROJECT.equals(projectId))) {
+ projectId = null;
+ } else if ((!DEFAULT_PROJECT.equals(projectId)) &&
+ (getProjects(ForgeHelper.getPortalName(request)).getProjectContext(
+ new ActionRequestPermissionsChecker(request), projectId) == null)) {
+ // No project context --> project does not exist.
+ projectId = null;
+ }
+
+ return projectId;
+ }
/**
* Prepares a request object for generating a JSP. PROJECT_NAME and
|
|
From: <jbo...@li...> - 2005-12-09 22:08:41
|
Author: unibrew
Date: 2005-12-09 17:08:33 -0500 (Fri, 09 Dec 2005)
New Revision: 1769
Added:
trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-app.xml
trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-portlet.xml
trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-service.xml
trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-web.xml
trunk/forge/portal-extensions/polls/src/web/WEB-INF/portlet-instances.xml
trunk/forge/portal-extensions/polls/src/web/WEB-INF/portlet.xml
trunk/forge/portal-extensions/polls/src/web/WEB-INF/tld/portlet.tld
trunk/forge/portal-extensions/polls/src/web/WEB-INF/web.xml
Modified:
trunk/forge/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsPortlet.java
Log:
[JBLAB-407] Adding and updating files for PollsPortlet.
Modified: trunk/forge/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsPortlet.java
===================================================================
--- trunk/forge/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsPortlet.java 2005-12-09 22:01:29 UTC (rev 1768)
+++ trunk/forge/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsPortlet.java 2005-12-09 22:08:33 UTC (rev 1769)
@@ -5,25 +5,34 @@
import javax.portlet.PortletException;
import javax.portlet.PortletRequestDispatcher;
import javax.portlet.PortletSession;
+import javax.portlet.PortletURL;
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.projects.PollTools;
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.portal.common.context.Context;
-import org.jboss.portal.common.context.DelegateContext;
import org.jboss.portal.core.model.User;
import org.jboss.portal.core.servlet.jsp.PortalJsp;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.aop.Inject;
+
+/**
+ *
+ * @author Ryszard Kozmik
+ *
+ */
public class PollsPortlet extends JBossPortlet {
public static final String VOTED_PARAMETER_NAME = "org.jboss.forge.polls.voted";
- public static final String VOTED_FALSE = "false";
- public static final String VOTED_TRUE = "true";
+ public static final String FALSE = "false";
+ public static final String TRUE = "true";
+ public static final String DETAILED_VIEW_REQUEST="details";
@Inject
ContentManager contentManager;
@@ -49,15 +58,29 @@
String voted = request.getParameter(VOTED_PARAMETER_NAME);
Context pollContext=null;
PortletRequestDispatcher rd = null;
- if (voted!=null && voted.compareTo(VOTED_TRUE)==0) {
+ if (voted!=null && voted.compareTo(TRUE)==0) {
+ System.out.println ("USER VOTED");
// Getting the poll context.
pollContext = PollTools.getInfoContext(portalName,projectId,contentManager,response);
rd = getPortletContext().getRequestDispatcher(
ForgeHelper.createRepoAccessPath(portalName, PollTools
.getInfoJsp()));
+ } else if (request.getParameter(DETAILED_VIEW_REQUEST)!=null &&
+ request.getParameter(DETAILED_VIEW_REQUEST).compareTo(TRUE)==0 ) {
+
+ System.out.println ("DETAILED VIEW");
+
+ String pollId = request.getParameter("pollId");
+ // Getting the poll context.
+ pollContext = PollTools.getDetailsContext(portalName,projectId,pollId,contentManager,response);
+ rd = getPortletContext().getRequestDispatcher(
+ ForgeHelper.createRepoAccessPath(portalName, PollTools
+ .getDetailsJsp()));
+
} else {
-// Getting the poll context.
+ System.out.println ("USER HAVEN'T VOTED");
+ // Getting the poll context.
pollContext = PollTools.getVotingContext(portalName,projectId,contentManager,response);
rd = getPortletContext().getRequestDispatcher(
ForgeHelper.createRepoAccessPath(portalName, PollTools
@@ -66,9 +89,52 @@
// Displaying.
request.setAttribute(PortalJsp.CTX_REQUEST, pollContext);
+ rd.include(request, response);
+ }
+
+ @Override
+ public void processAction(JBossActionRequest request, JBossActionResponse response) {
+ String portalName = ForgeHelper.getPortalName(request);
+ String vote=request.getParameter("vote");
+ String pollId = request.getParameter("pollId");
+ PortletURL url=response.createRenderURL();
+ System.out.println ("HELLO I'M IN POLLPORTLET VOTE: "+vote);
+ String userId = request.getUser()==null?Integer.toString((int)(Math.random()*100000)):request.getUser().getUserName();
+ // Getting name of the project on which the download counter is used.
+ String projectId = ProjectsHelper.getSelectedProjectId(request);
+ System.out.println("PROJECTID:"+projectId);
+ if (projectId==null){
+ projectId = request.getParameter(ProjectsHelper.PROJECT_URL_PARAM);
+ System.out.println ("2 PROJECTID:"+projectId);
+ if (projectId==null) {
+ projectId="jbosswiki";
+ }
+ }
-
- rd.include(request, response);
+ if (vote != null && !vote.equals("")) {
+ System.out.println ("USER VOTE");
+ response.setRenderParameter(VOTED_PARAMETER_NAME,TRUE);
+ if (vote.equals(TRUE)){
+ System.out.println ("VOTING POSITIVLY");
+ System.out.println ("POLLID:"+pollId+" userId:"+userId+" PROJECTID: "+projectId);
+ if (PollTools.getDesc(portalName,contentManager).votePositive(pollId,userId,projectId)) {
+ System.out.println ("ZAGŁOSOWANO");
+ } else {
+ System.out.println ("GŁOS ODRZUCONO");
+ }
+ } else if (vote.equals(FALSE)){
+ System.out.println("VOTING NEGATIVLY");
+ System.out.println ("POLLID:"+pollId+" userId:"+userId+" PROJECTID: "+projectId);
+ if (PollTools.getDesc(portalName,contentManager).voteNegative(pollId,userId,projectId)) {
+ System.out.println ("ZAGŁOSOWANO");
+ } else {
+ System.out.println ("GŁOS ODRZUCONO");
+ }
+ }
+ } else {
+ System.out.println ("USER ZONK");
+ }
}
+
}
Added: trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-app.xml
===================================================================
--- trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-app.xml 2005-12-09 22:01:29 UTC (rev 1768)
+++ trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-app.xml 2005-12-09 22:08:33 UTC (rev 1769)
@@ -0,0 +1,3 @@
+<jboss-app>
+ <app-name>polls</app-name>
+</jboss-app>
Added: trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-portlet.xml 2005-12-09 22:01:29 UTC (rev 1768)
+++ trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-portlet.xml 2005-12-09 22:08:33 UTC (rev 1769)
@@ -0,0 +1,5 @@
+<portlet-app>
+ <portlet>
+ <portlet-name>PollsPortlet</portlet-name>
+ </portlet>
+</portlet-app>
Added: trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-service.xml
===================================================================
--- trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-service.xml 2005-12-09 22:01:29 UTC (rev 1768)
+++ trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-service.xml 2005-12-09 22:08:33 UTC (rev 1769)
@@ -0,0 +1,2 @@
+<server>
+</server>
Added: trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-web.xml
===================================================================
--- trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-web.xml 2005-12-09 22:01:29 UTC (rev 1768)
+++ trunk/forge/portal-extensions/polls/src/web/WEB-INF/jboss-web.xml 2005-12-09 22:08:33 UTC (rev 1769)
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<jboss-web>
+</jboss-web>
Added: trunk/forge/portal-extensions/polls/src/web/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/forge/portal-extensions/polls/src/web/WEB-INF/portlet-instances.xml 2005-12-09 22:01:29 UTC (rev 1768)
+++ trunk/forge/portal-extensions/polls/src/web/WEB-INF/portlet-instances.xml 2005-12-09 22:08:33 UTC (rev 1769)
@@ -0,0 +1,7 @@
+<?xml version="1.0" standalone="yes"?>
+<instances>
+ <instance>
+ <instance-name>PollsPortletInstance</instance-name>
+ <component-ref>PollsPortlet</component-ref>
+ </instance>
+</instances>
Added: trunk/forge/portal-extensions/polls/src/web/WEB-INF/portlet.xml
===================================================================
--- trunk/forge/portal-extensions/polls/src/web/WEB-INF/portlet.xml 2005-12-09 22:01:29 UTC (rev 1768)
+++ trunk/forge/portal-extensions/polls/src/web/WEB-INF/portlet.xml 2005-12-09 22:08:33 UTC (rev 1769)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd" version="1.0">
+ <portlet>
+ <portlet-name>PollsPortlet</portlet-name>
+ <portlet-class>org.jboss.forge.polls.PollsPortlet</portlet-class>
+ <supported-locale>en</supported-locale>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ </supported-window-states>
+ <portlet-info>
+ <title>JBoss Polls Portlet</title>
+ </portlet-info>
+ </portlet>
+</portlet-app>
Added: trunk/forge/portal-extensions/polls/src/web/WEB-INF/tld/portlet.tld
===================================================================
--- trunk/forge/portal-extensions/polls/src/web/WEB-INF/tld/portlet.tld 2005-12-09 22:01:29 UTC (rev 1768)
+++ trunk/forge/portal-extensions/polls/src/web/WEB-INF/tld/portlet.tld 2005-12-09 22:08:33 UTC (rev 1769)
@@ -0,0 +1,82 @@
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd"
+ version="2.0">
+ <!--
+ JBoss, the OpenSource J2EE webOS
+ Distributable under LGPL license.
+ See terms of license at gnu.org.
+ -->
+ <tlib-version>1.1</tlib-version>
+ <jsp-version>2.0</jsp-version>
+ <shortname>JBoss Portal tags</shortname>
+ <info>JBoss Portal tags</info>
+
+ <function>
+ <name>i18n</name>
+ <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+ <function-signature>java.lang.String getMessage(java.lang.String)</function-signature>
+ </function>
+
+ <function>
+ <name>out</name>
+ <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+ <function-signature>java.lang.String out(java.lang.String)</function-signature>
+ </function>
+
+ <function>
+ <name>i18nout</name>
+ <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class>
+ <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature>
+ </function>
+
+ <tag>
+ <name>if</name>
+ <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tagclass>
+ <attribute>
+ <name>ctx</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>iterate</name>
+ <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tagclass>
+ <attribute>
+ <name>ctx</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>include</name>
+ <tagclass>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tagclass>
+ <attribute>
+ <name>page</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>error</name>
+ <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tagclass>
+ <attribute>
+ <name>key</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>errors</name>
+ <tagclass>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tagclass>
+ </tag>
+
+ <tag>
+ <name>success</name>
+ <tagclass>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tagclass>
+ </tag>
+</taglib>
Added: trunk/forge/portal-extensions/polls/src/web/WEB-INF/web.xml
===================================================================
--- trunk/forge/portal-extensions/polls/src/web/WEB-INF/web.xml 2005-12-09 22:01:29 UTC (rev 1768)
+++ trunk/forge/portal-extensions/polls/src/web/WEB-INF/web.xml 2005-12-09 22:08:33 UTC (rev 1769)
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <filter>
+ <filter-name>filesFromRepoFilter</filter-name>
+ <filter-class>org.jboss.forge.common.FilesFromRepoFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>filesFromRepoFilter</filter-name>
+ <url-pattern>/repo-access/*</url-pattern>
+ <dispatcher>INCLUDE</dispatcher>
+ </filter-mapping>
+</web-app>
\ No newline at end of file
|
|
From: <jbo...@li...> - 2005-12-09 22:01:39
|
Author: adamw Date: 2005-12-09 17:01:29 -0500 (Fri, 09 Dec 2005) New Revision: 1768 Modified: trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/exceptions/DeleteException.java trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/exceptions/SaveException.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnResourceProxy.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/DummyService.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/AddDeleteTest.java trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/CopyMoveTest.java trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/LogMessageTest.java trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/PropertiesTest.java trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/ResourceInjectTest.java trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/SimpleDirectoryTest.java trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/SlashNamesTest.java Log: Save and delete exceptions as normal exceptions (instead of runtime) http://jira.jboss.com/jira/browse/JBSHOTOKU-37 Modified: trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/exceptions/DeleteException.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/exceptions/DeleteException.java 2005-12-09 21:26:03 UTC (rev 1767) +++ trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/exceptions/DeleteException.java 2005-12-09 22:01:29 UTC (rev 1768) @@ -21,12 +21,11 @@ */ package org.jboss.shotoku.exceptions; -// TODO /** * * @author Adam Warski (ad...@as...) */ -public class DeleteException extends RuntimeException { +public class DeleteException extends Exception { public DeleteException(Exception e) { super(e); } Modified: trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/exceptions/SaveException.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/exceptions/SaveException.java 2005-12-09 21:26:03 UTC (rev 1767) +++ trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/exceptions/SaveException.java 2005-12-09 22:01:29 UTC (rev 1768) @@ -21,12 +21,11 @@ */ package org.jboss.shotoku.exceptions; -// TODO /** * * @author Adam Warski (ad...@as...) */ -public class SaveException extends RuntimeException { +public class SaveException extends Exception { public SaveException(Exception e) { super(e); } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnResourceProxy.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnResourceProxy.java 2005-12-09 21:26:03 UTC (rev 1767) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnResourceProxy.java 2005-12-09 22:01:29 UTC (rev 1768) @@ -25,6 +25,7 @@ import java.util.Map; import org.jboss.shotoku.Directory; +import org.jboss.shotoku.exceptions.DeleteException; import org.jboss.shotoku.exceptions.RepositoryException; import org.jboss.shotoku.exceptions.ResourceDeleted; import org.jboss.shotoku.exceptions.SaveException; @@ -218,7 +219,7 @@ return currentResource.getFullName(); } - public void delete() throws RepositoryException { + public void delete() throws DeleteException, RepositoryException { checkSwitch(); currentResource.delete(); } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/DummyService.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/DummyService.java 2005-12-09 21:26:03 UTC (rev 1767) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/DummyService.java 2005-12-09 22:01:29 UTC (rev 1768) @@ -106,12 +106,10 @@ } public void addTreeToModfied(String id, String fullPath) { - // TODO Auto-generated method stub } public boolean isTreeModified(String id, String fullPath) { - // TODO Auto-generated method stub return false; } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java 2005-12-09 21:26:03 UTC (rev 1767) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java 2005-12-09 22:01:29 UTC (rev 1768) @@ -31,6 +31,7 @@ import org.jboss.shotoku.Directory; import org.jboss.shotoku.Node; import org.jboss.shotoku.Resource; +import org.jboss.shotoku.exceptions.DeleteException; import org.jboss.shotoku.exceptions.RepositoryException; import org.jboss.shotoku.exceptions.ResourceAlreadyExists; import org.jboss.shotoku.exceptions.ResourceDoesNotExist; @@ -104,7 +105,7 @@ cm.save(toSave, "aaa"); } - public static void simpleDirTest() throws RepositoryException, ResourceAlreadyExists, SaveException { + public static void simpleDirTest() throws DeleteException, RepositoryException, ResourceAlreadyExists, SaveException { ContentManager cm = ContentManager.getContentManager("shotoku-test"); try { Modified: trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/AddDeleteTest.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/AddDeleteTest.java 2005-12-09 21:26:03 UTC (rev 1767) +++ trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/AddDeleteTest.java 2005-12-09 22:01:29 UTC (rev 1768) @@ -22,6 +22,7 @@ package org.jboss.shotoku.test; import org.jboss.shotoku.Node; +import org.jboss.shotoku.exceptions.DeleteException; import org.jboss.shotoku.exceptions.RepositoryException; import org.jboss.shotoku.exceptions.ResourceAlreadyExists; import org.jboss.shotoku.exceptions.ResourceDoesNotExist; @@ -45,7 +46,7 @@ } } - public void testDeleteWithoutSave() throws ResourceAlreadyExists, ResourceDoesNotExist { + public void testDeleteWithoutSave() throws DeleteException, ResourceAlreadyExists, ResourceDoesNotExist { Node n = cm.getRootDirectory().newNode(TEST_FILE); checkTestFileNotExists(); @@ -55,7 +56,7 @@ checkTestFileNotExists(); } - public void testDeleteWithSaveImmediate() throws ResourceAlreadyExists, ResourceDoesNotExist, RepositoryException, SaveException { + public void testDeleteWithSaveImmediate() throws DeleteException, ResourceAlreadyExists, ResourceDoesNotExist, RepositoryException, SaveException { Node n = cm.getRootDirectory().newNode(TEST_FILE); checkTestFileNotExists(); @@ -74,7 +75,7 @@ checkTestFileNotExists(); } - public void testDeleteWithSaveDelayed() throws ResourceAlreadyExists, ResourceDoesNotExist, RepositoryException, SaveException { + public void testDeleteWithSaveDelayed() throws DeleteException, ResourceAlreadyExists, ResourceDoesNotExist, RepositoryException, SaveException { Node n = cm.getRootDirectory().newNode(TEST_FILE); checkTestFileNotExists(); @@ -107,7 +108,7 @@ checkTestFileNotExists(); } - public void testAddAfterDelete() throws ResourceAlreadyExists, ResourceDoesNotExist, RepositoryException, SaveException { + public void testAddAfterDelete() throws DeleteException, ResourceAlreadyExists, ResourceDoesNotExist, RepositoryException, SaveException { // Adding and deleting Node n = cm.getRootDirectory().newNode(TEST_FILE); n.save(TEST_FILE); Modified: trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/CopyMoveTest.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/CopyMoveTest.java 2005-12-09 21:26:03 UTC (rev 1767) +++ trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/CopyMoveTest.java 2005-12-09 22:01:29 UTC (rev 1768) @@ -23,6 +23,7 @@ import org.jboss.shotoku.Directory; import org.jboss.shotoku.Node; +import org.jboss.shotoku.exceptions.DeleteException; import org.jboss.shotoku.exceptions.ResourceAlreadyExists; import org.jboss.shotoku.exceptions.ResourceDoesNotExist; @@ -122,7 +123,7 @@ } @Override - protected void tearDown() throws ResourceAlreadyExists, ResourceDoesNotExist { + protected void tearDown() throws DeleteException, ResourceAlreadyExists, ResourceDoesNotExist { try { cm.getDirectory(TEST_DIR).delete(); } catch (ResourceDoesNotExist e) { Modified: trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/LogMessageTest.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/LogMessageTest.java 2005-12-09 21:26:03 UTC (rev 1767) +++ trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/LogMessageTest.java 2005-12-09 22:01:29 UTC (rev 1768) @@ -23,6 +23,7 @@ import org.jboss.shotoku.Directory; import org.jboss.shotoku.Node; +import org.jboss.shotoku.exceptions.DeleteException; import org.jboss.shotoku.exceptions.RepositoryException; import org.jboss.shotoku.exceptions.ResourceAlreadyExists; import org.jboss.shotoku.exceptions.ResourceDoesNotExist; @@ -70,7 +71,7 @@ assertNull(d.getLogMessage()); } - public void tearDown() { + public void tearDown() throws DeleteException { try { cm.getDirectory(TEST_DIR).delete(); } catch (ResourceDoesNotExist e) { Modified: trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/PropertiesTest.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/PropertiesTest.java 2005-12-09 21:26:03 UTC (rev 1767) +++ trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/PropertiesTest.java 2005-12-09 22:01:29 UTC (rev 1768) @@ -24,6 +24,7 @@ import java.util.Map; import org.jboss.shotoku.Node; +import org.jboss.shotoku.exceptions.DeleteException; import org.jboss.shotoku.exceptions.RepositoryException; import org.jboss.shotoku.exceptions.ResourceAlreadyExists; import org.jboss.shotoku.exceptions.ResourceDoesNotExist; @@ -117,7 +118,7 @@ } @Override - protected void tearDown() throws ResourceAlreadyExists, ResourceDoesNotExist { + protected void tearDown() throws DeleteException, ResourceAlreadyExists, ResourceDoesNotExist { cm.getNode(TEST_FILE).delete(); } } Modified: trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/ResourceInjectTest.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/ResourceInjectTest.java 2005-12-09 21:26:03 UTC (rev 1767) +++ trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/ResourceInjectTest.java 2005-12-09 22:01:29 UTC (rev 1768) @@ -25,6 +25,7 @@ import org.jboss.shotoku.Node; import org.jboss.shotoku.aop.DirectoryInject; import org.jboss.shotoku.aop.NodeInject; +import org.jboss.shotoku.exceptions.DeleteException; import org.jboss.shotoku.exceptions.RepositoryException; import org.jboss.shotoku.exceptions.ResourceAlreadyExists; import org.jboss.shotoku.exceptions.ResourceDoesNotExist; @@ -75,7 +76,7 @@ assertTrue(TEST_TEXT_2.equals(cm.getNode(TEST_NODE).getContent())); } - public void tearDown() throws ResourceAlreadyExists, ResourceDoesNotExist { + public void tearDown() throws ResourceAlreadyExists, DeleteException, ResourceDoesNotExist { try { cm.getNode(TEST_NODE).delete(); } catch(ResourceDoesNotExist e) { Modified: trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/SimpleDirectoryTest.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/SimpleDirectoryTest.java 2005-12-09 21:26:03 UTC (rev 1767) +++ trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/SimpleDirectoryTest.java 2005-12-09 22:01:29 UTC (rev 1768) @@ -23,6 +23,7 @@ import org.jboss.shotoku.Directory; import org.jboss.shotoku.Node; +import org.jboss.shotoku.exceptions.DeleteException; import org.jboss.shotoku.exceptions.RepositoryException; import org.jboss.shotoku.exceptions.ResourceAlreadyExists; import org.jboss.shotoku.exceptions.ResourceDoesNotExist; @@ -73,7 +74,7 @@ } @Override - protected void tearDown() throws ResourceAlreadyExists, ResourceDoesNotExist { + protected void tearDown() throws ResourceAlreadyExists, DeleteException, ResourceDoesNotExist { try { Directory newDir = cm.getDirectory("new-dir-test"); newDir.delete(); Modified: trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/SlashNamesTest.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/SlashNamesTest.java 2005-12-09 21:26:03 UTC (rev 1767) +++ trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/SlashNamesTest.java 2005-12-09 22:01:29 UTC (rev 1768) @@ -24,6 +24,7 @@ import org.jboss.shotoku.ContentManager; import org.jboss.shotoku.Directory; import org.jboss.shotoku.Node; +import org.jboss.shotoku.exceptions.DeleteException; import org.jboss.shotoku.exceptions.RepositoryException; import org.jboss.shotoku.exceptions.ResourceAlreadyExists; import org.jboss.shotoku.exceptions.ResourceDoesNotExist; @@ -92,7 +93,7 @@ cm2.getRootDirectory(); } - public void tearDown() throws ResourceAlreadyExists, ResourceDoesNotExist { + public void tearDown() throws ResourceAlreadyExists, DeleteException, ResourceDoesNotExist { try { cm.getDirectory(TEST_DIR).delete(); } catch (ResourceDoesNotExist e) { |
|
From: <jbo...@li...> - 2005-12-09 21:26:09
|
Author: rl...@jb...
Date: 2005-12-09 16:26:03 -0500 (Fri, 09 Dec 2005)
New Revision: 1767
Modified:
trunk/labs/jbossbuild/projects/maven-plugins/artifact-utils/src/main/java/com/stchome/maven/plugins/ArtifactItem.java
Log:
added ability to rename files pulled from the repository
Modified: trunk/labs/jbossbuild/projects/maven-plugins/artifact-utils/src/main/java/com/stchome/maven/plugins/ArtifactItem.java
===================================================================
--- trunk/labs/jbossbuild/projects/maven-plugins/artifact-utils/src/main/java/com/stchome/maven/plugins/ArtifactItem.java 2005-12-09 21:25:47 UTC (rev 1766)
+++ trunk/labs/jbossbuild/projects/maven-plugins/artifact-utils/src/main/java/com/stchome/maven/plugins/ArtifactItem.java 2005-12-09 21:26:03 UTC (rev 1767)
@@ -20,6 +20,7 @@
private String version;
private String type;
private File location;
+ private String rename;
private boolean overWrite = true;
/**
@@ -120,4 +121,17 @@
{
this.overWrite = overWrite;
}
+
+/**
+ * @return Returns the rename.
+ */
+public String getRename() {
+ return rename;
}
+/**
+ * @param rename The rename to set.
+ */
+public void setRename(String rename) {
+ this.rename = rename;
+}
+}
|
|
From: <jbo...@li...> - 2005-12-09 21:25:50
|
Author: rl...@jb...
Date: 2005-12-09 16:25:47 -0500 (Fri, 09 Dec 2005)
New Revision: 1766
Modified:
trunk/labs/jbossbuild/projects/maven-plugins/artifact-utils/src/main/java/com/stchome/maven/plugins/CopyMojo.java
Log:
added ability to rename files pulled from the repository
Modified: trunk/labs/jbossbuild/projects/maven-plugins/artifact-utils/src/main/java/com/stchome/maven/plugins/CopyMojo.java
===================================================================
--- trunk/labs/jbossbuild/projects/maven-plugins/artifact-utils/src/main/java/com/stchome/maven/plugins/CopyMojo.java 2005-12-09 21:19:57 UTC (rev 1765)
+++ trunk/labs/jbossbuild/projects/maven-plugins/artifact-utils/src/main/java/com/stchome/maven/plugins/CopyMojo.java 2005-12-09 21:25:47 UTC (rev 1766)
@@ -38,6 +38,14 @@
if (!artifact.getFile().exists() || artifactItem.isOverWrite())
{
FileUtils.copyFileToDirectory(artifact.getFile(), location);
+
+ if (artifactItem.getRename() != null)
+ {
+ File oldFile = FileUtils.resolveFile(location, artifact.getFile().getName());
+ File newFile = FileUtils.resolveFile(location, artifactItem.getRename());
+ FileUtils.rename(oldFile, newFile);
+ }
+
}
else
{
|
|
From: <jbo...@li...> - 2005-12-09 21:20:08
|
Author: rl...@jb... Date: 2005-12-09 16:19:57 -0500 (Fri, 09 Dec 2005) New Revision: 1765 Removed: trunk/labs/jbossbuild/projects/jboss/jmx/file1.txt Log: cleanup Deleted: trunk/labs/jbossbuild/projects/jboss/jmx/file1.txt =================================================================== --- trunk/labs/jbossbuild/projects/jboss/jmx/file1.txt 2005-12-09 20:56:12 UTC (rev 1764) +++ trunk/labs/jbossbuild/projects/jboss/jmx/file1.txt 2005-12-09 21:19:57 UTC (rev 1765) @@ -1,31 +0,0 @@ -/cygdrive/c/j2sdk1.4.2_08/bin/java -classpath c:\maven\maven-2.0/core/boot/classworlds-1.1-alpha-2.jar -Dclassworlds.conf=c:\maven\maven-2.0/bin/m2.conf -Dmaven.home=c:\maven\maven-2.0 org.codehaus.classworlds.Launcher compile -[INFO] Scanning for projects... -[INFO] ---------------------------------------------------------------------------- -[INFO] Building jmx -[INFO] task-segment: [compile] -[INFO] ---------------------------------------------------------------------------- -[INFO] [resources:resources] -[INFO] Using default encoding to copy filtered resources. -[INFO] ---------------------------------------------------------------------------- -[ERROR] BUILD ERROR -[INFO] ---------------------------------------------------------------------------- -[INFO] Failed to resolve artifact. - -GroupId: org.jboss.server.mbeans -ArtifactId: mbeans -Version: 5.0-SNAPSHOT - -Reason: Unable to download the artifact from any repository - org.jboss.server.mbeans:mbeans:5.0-SNAPSHOT:jar - -from the specified remote repositories: - central (http://repo1.maven.org/maven2) - - -[INFO] ---------------------------------------------------------------------------- -[INFO] For more information, run Maven with the -e switch -[INFO] ---------------------------------------------------------------------------- -[INFO] Total time: 1 second -[INFO] Finished at: Tue Nov 29 09:08:09 CST 2005 -[INFO] Final Memory: 2M/4M -[INFO] ---------------------------------------------------------------------------- |
|
From: <jbo...@li...> - 2005-12-09 20:56:15
|
Author: rl...@jb...
Date: 2005-12-09 15:56:12 -0500 (Fri, 09 Dec 2005)
New Revision: 1764
Removed:
trunk/labs/jbossbuild/projects/jboss/kernel/file1.txt
Modified:
trunk/labs/jbossbuild/projects/jboss/kernel/pom.xml
Log:
cleanup
Deleted: trunk/labs/jbossbuild/projects/jboss/kernel/file1.txt
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/kernel/file1.txt 2005-12-09 20:51:36 UTC (rev 1763)
+++ trunk/labs/jbossbuild/projects/jboss/kernel/file1.txt 2005-12-09 20:56:12 UTC (rev 1764)
@@ -1,263 +0,0 @@
-/cygdrive/c/j2sdk1.4.2_08/bin/java -classpath c:\maven\maven-2.0/core/boot/classworlds-1.1-alpha-2.jar -Dclassworlds.conf=c:\maven\maven-2.0/bin/m2.conf -Dmaven.home=c:\maven\maven-2.0 org.codehaus.classworlds.Launcher -X compile
-+ Error stacktraces are turned on.
-[DEBUG] Building Maven user-level plugin registry from: 'C:\Documents and Settings\ruel\.m2\plugin-registry.xml'
-[DEBUG] Building Maven global-level plugin registry from: 'c:\maven\maven-2.0\conf\plugin-registry.xml'
-[INFO] Scanning for projects...
-[INFO] ----------------------------------------------------------------------------
-[INFO] Building kernel
-[INFO] task-segment: [compile]
-[INFO] ----------------------------------------------------------------------------
-[DEBUG] maven-resources-plugin: resolved to version 2.1 from repository central
-[DEBUG] Retrieving parent-POM from the repository for project: null:maven-resources-plugin:maven-plugin:2.1
-[DEBUG] maven-compiler-plugin: resolved to version 2.0 from repository central
-[DEBUG] Retrieving parent-POM from the repository for project: null:maven-compiler-plugin:maven-plugin:2.0
-[DEBUG] org.apache.maven.plugins:maven-resources-plugin:maven-plugin:2.1 (selected for runtime)
-[DEBUG] Retrieving parent-POM from the repository for project: org.apache.maven:maven-model:jar:2.0
-[DEBUG] org.apache.maven:maven-model:jar:2.0 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] Retrieving parent-POM from the repository for project: null:maven-project:jar:2.0
-[DEBUG] org.apache.maven:maven-project:jar:2.0 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-8 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] classworlds:classworlds:jar:1.1-alpha-2 (selected for runtime)
-[DEBUG] junit:junit:jar:3.8.1 (selected for runtime)
-[DEBUG] Retrieving parent-POM from the repository for project: org.apache.maven:maven-artifact:jar:2.0
-[DEBUG] org.apache.maven:maven-artifact:jar:2.0 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] org.apache.maven:maven-model:jar:2.0 (selected for runtime)
-[DEBUG] Retrieving parent-POM from the repository for project: org.apache.maven:maven-artifact-manager:jar:2.0
-[DEBUG] org.apache.maven:maven-artifact-manager:jar:2.0 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-8 (selected for runtime)
-[DEBUG] org.apache.maven:maven-artifact:jar:2.0 (selected for runtime)
-[DEBUG] Retrieving parent-POM from the repository for project: org.apache.maven:maven-repository-metadata:jar:2.0
-[DEBUG] org.apache.maven:maven-repository-metadata:jar:2.0 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] org.apache.maven.wagon:wagon-provider-api:jar:1.0-alpha-5 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] Retrieving parent-POM from the repository for project: null:maven-profile:jar:2.0
-[DEBUG] org.apache.maven:maven-profile:jar:2.0 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-8 (selected for runtime)
-[DEBUG] org.apache.maven:maven-model:jar:2.0 (selected for runtime)
-[DEBUG] commons-io:commons-io:jar:1.0 (selected for runtime)
-[DEBUG] junit:junit:jar:3.8.1 (selected for runtime)
-[DEBUG] Retrieving parent-POM from the repository for project: org.apache.maven:maven-plugin-api:jar:2.0
-[DEBUG] org.apache.maven:maven-plugin-api:jar:2.0 (selected for runtime)
-[DEBUG] Configuring mojo 'org.apache.maven.plugins:maven-resources-plugin:2.1:resources' -->
-[DEBUG] (f) filters = []
-[DEBUG] (f) outputDirectory = c:\projects\maven-jboss-head\jboss-head\kernel\target\classes
-[DEBUG] (f) project = org.apache.maven.project.MavenProject@450f60a3
-[DEBUG] (f) resources = [org.apache.maven.model.Resource@961dff]
-[DEBUG] -- end configuration --
-[INFO] [resources:resources]
-[INFO] Using default encoding to copy filtered resources.
-[DEBUG] org.jboss.server.kernel:kernel:jar:5.0-SNAPSHOT (selected for null)
-[DEBUG] Skipping disabled repository central
-[DEBUG] test: using locally installed snapshot
-[DEBUG] org.jboss.server.test:test:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] Skipping disabled repository central
-[DEBUG] testsuite-support: using locally installed snapshot
-[DEBUG] Retrieving parent-POM from the repository for project: org.jboss.server.common.testsuite-support:testsuite-support:jar:5.0-SNAPSHOT
-[DEBUG] Skipping disabled repository central
-[DEBUG] project.common: using locally installed snapshot
-[DEBUG] org.jboss.server.common.testsuite-support:testsuite-support:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] apache-xerces:xml-apis:jar:2.7.0 (selected for compile)
-[DEBUG] apache-log4j:snmpTrapAppender:jar:1.2.8 (selected for compile)
-[DEBUG] apache-log4j:log4j:jar:1.2.8 (selected for compile)
-[DEBUG] apache-xerces:resolver:jar:2.7.0 (selected for compile)
-[DEBUG] apache-jaxme:jaxmexs:jar:0.2-cvs (selected for compile)
-[DEBUG] oswego-concurrent:concurrent:jar:1.3.4 (selected for compile)
-[DEBUG] apache-slide:webdavlib:jar:2.0 (selected for compile)
-[DEBUG] wutka-dtdparser:dtdparser121:jar:1.2.1 (selected for compile)
-[DEBUG] gnu-regexp:gnu-regexp:jar:1.1.14 (selected for compile)
-[DEBUG] dom4j:dom4j:jar:1.5 (selected for compile)
-[DEBUG] dom4j:dom4j:jar:1.5.2 (removed - causes a cycle in the graph)
-[DEBUG] jaxen:jaxen:jar:1.1-beta-4 (selected for compile)
-[DEBUG] apache-xerces:xercesImpl:jar:2.7.0 (selected for compile)
-[DEBUG] Skipping disabled repository central
-[DEBUG] common-source: using locally installed snapshot
-[DEBUG] Retrieving parent-POM from the repository for project: org.jboss.server.common.common-source:common-source:jar:5.0-SNAPSHOT
-[DEBUG] project.common: using locally installed snapshot
-[DEBUG] org.jboss.server.common.common-source:common-source:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] gnu-regexp:gnu-regexp:jar:1.1.14 (selected for compile)
-[DEBUG] apache-xerces:xml-apis:jar:2.7.0 (selected for compile)
-[DEBUG] dom4j:dom4j:jar:1.5 (selected for compile)
-[DEBUG] apache-log4j:snmpTrapAppender:jar:1.2.8 (selected for compile)
-[DEBUG] apache-xerces:xercesImpl:jar:2.7.0 (selected for compile)
-[DEBUG] apache-log4j:log4j:jar:1.2.8 (selected for compile)
-[DEBUG] apache-xerces:resolver:jar:2.7.0 (selected for compile)
-[DEBUG] apache-jaxme:jaxmexs:jar:0.2-cvs (selected for compile)
-[DEBUG] apache-httpclient:commons-httpclient:jar:2.0 (selected for compile)
-[DEBUG] oswego-concurrent:concurrent:jar:1.3.4 (selected for compile)
-[DEBUG] apache-slide:webdavlib:jar:2.0 (selected for compile)
-[DEBUG] wutka-dtdparser:dtdparser121:jar:1.2.1 (selected for compile)
-[DEBUG] apache-httpclient:commons-httpclient:jar:2.0 (selected for compile)
-[DEBUG] junit:junit:jar:3.8.1 (selected for compile)
-[DEBUG] apache-log4j:snmpTrapAppender:jar:1.2.8 (selected for compile)
-[DEBUG] apache-log4j:log4j:jar:1.2.8 (selected for compile)
-[DEBUG] ant:ant:jar:1.6.5 (selected for compile)
-[DEBUG] Skipping disabled repository central
-[DEBUG] jboss-j2se: using locally installed snapshot
-[DEBUG] Retrieving parent-POM from the repository for project: org.jboss.server.j2se.jboss-j2se:jboss-j2se:jar:5.0-SNAPSHOT
-[DEBUG] Skipping disabled repository central
-[DEBUG] j2se: using locally installed snapshot
-[DEBUG] org.jboss.server.j2se.jboss-j2se:jboss-j2se:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] gnu-regexp:gnu-regexp:jar:1.1.14 (selected for compile)
-[DEBUG] apache-xerces:xml-apis:jar:2.7.0 (selected for compile)
-[DEBUG] Skipping disabled repository central
-[DEBUG] primary-source: using locally installed snapshot
-[DEBUG] Retrieving parent-POM from the repository for project: org.jboss.server.common.primary-source:primary-source:jboss-jar:5.0-SNAPSHOT
-[DEBUG] project.common: using locally installed snapshot
-[DEBUG] org.jboss.server.common.primary-source:primary-source:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] apache-xerces:xml-apis:jar:2.7.0 (selected for compile)
-[DEBUG] apache-log4j:snmpTrapAppender:jar:1.2.8 (selected for compile)
-[DEBUG] apache-log4j:log4j:jar:1.2.8 (selected for compile)
-[DEBUG] apache-xerces:resolver:jar:2.7.0 (selected for compile)
-[DEBUG] apache-jaxme:jaxmexs:jar:0.2-cvs (selected for compile)
-[DEBUG] oswego-concurrent:concurrent:jar:1.3.4 (selected for compile)
-[DEBUG] apache-slide:webdavlib:jar:2.0 (selected for compile)
-[DEBUG] wutka-dtdparser:dtdparser121:jar:1.2.1 (selected for compile)
-[DEBUG] gnu-regexp:gnu-regexp:jar:1.1.14 (selected for compile)
-[DEBUG] dom4j:dom4j:jar:1.5 (selected for compile)
-[DEBUG] apache-xerces:xercesImpl:jar:2.7.0 (selected for compile)
-[DEBUG] org.jboss.server.common.common-source:common-source:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] org.jboss.server.common.testsuite-support:testsuite-support:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] apache-httpclient:commons-httpclient:jar:2.0 (selected for compile)
-[DEBUG] dom4j:dom4j:jar:1.5 (selected for compile)
-[DEBUG] apache-log4j:snmpTrapAppender:jar:1.2.8 (selected for compile)
-[DEBUG] apache-xerces:xercesImpl:jar:2.7.0 (selected for compile)
-[DEBUG] apache-log4j:log4j:jar:1.2.8 (selected for compile)
-[DEBUG] apache-xerces:resolver:jar:2.7.0 (selected for compile)
-[DEBUG] apache-jaxme:jaxmexs:jar:0.2-cvs (selected for compile)
-[DEBUG] oswego-concurrent:concurrent:jar:1.3.4 (selected for compile)
-[DEBUG] apache-slide:webdavlib:jar:2.0 (selected for compile)
-[DEBUG] wutka-dtdparser:dtdparser121:jar:1.2.1 (selected for compile)
-[DEBUG] Skipping disabled repository central
-[DEBUG] container: using locally installed snapshot
-[DEBUG] org.jboss.server.container:container:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] org.jboss.server.test:test:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] org.jboss.server.common.primary-source:primary-source:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] apache-xerces:xml-apis:jar:2.7.0 (selected for compile)
-[DEBUG] apache-log4j:snmpTrapAppender:jar:1.2.8 (selected for compile)
-[DEBUG] apache-log4j:log4j:jar:1.2.8 (selected for compile)
-[DEBUG] apache-xerces:resolver:jar:2.7.0 (selected for compile)
-[DEBUG] apache-jaxme:jaxmexs:jar:0.2-cvs (selected for compile)
-[DEBUG] oswego-concurrent:concurrent:jar:1.3.4 (selected for compile)
-[DEBUG] apache-slide:webdavlib:jar:2.0 (selected for compile)
-[DEBUG] wutka-dtdparser:dtdparser121:jar:1.2.1 (selected for compile)
-[DEBUG] gnu-regexp:gnu-regexp:jar:1.1.14 (selected for compile)
-[DEBUG] dom4j:dom4j:jar:1.5 (selected for compile)
-[DEBUG] apache-xerces:xercesImpl:jar:2.7.0 (selected for compile)
-[DEBUG] org.jboss.server.common.common-source:common-source:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] org.jboss.server.common.testsuite-support:testsuite-support:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] apache-httpclient:commons-httpclient:jar:2.0 (selected for compile)
-[DEBUG] Skipping disabled repository central
-[DEBUG] dependency: using locally installed snapshot
-[DEBUG] org.jboss.server.dependency:dependency:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] org.jboss.server.common.primary-source:primary-source:jar:5.0-SNAPSHOT (selected for compile)
-[DEBUG] testsuite-support: using locally installed snapshot
-[DEBUG] container: using locally installed snapshot
-[DEBUG] jboss-j2se: using locally installed snapshot
-[DEBUG] primary-source: using locally installed snapshot
-[DEBUG] test: using locally installed snapshot
-[DEBUG] common-source: using locally installed snapshot
-[DEBUG] dependency: using locally installed snapshot
-[DEBUG] org.apache.maven.plugins:maven-compiler-plugin:maven-plugin:2.0 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-compiler-api:jar:1.5.1 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] classworlds:classworlds:jar:1.1-alpha-2 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-8 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] classworlds:classworlds:jar:1.1-alpha-2 (selected for runtime)
-[DEBUG] junit:junit:jar:3.8.1 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-compiler-manager:jar:1.5.1 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-8 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-compiler-api:jar:1.5.1 (selected for runtime)
-[DEBUG] classworlds:classworlds:jar:1.1-alpha-2 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-compiler-javac:jar:1.5.1 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-compiler-api:jar:1.5.1 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-8 (selected for runtime)
-[DEBUG] classworlds:classworlds:jar:1.1-alpha-2 (selected for runtime)
-[DEBUG] org.apache.maven:maven-plugin-api:jar:2.0 (selected for runtime)
-[DEBUG] org.apache.maven:maven-artifact:jar:2.0 (selected for runtime)
-[DEBUG] org.codehaus.plexus:plexus-utils:jar:1.0.4 (selected for runtime)
-[DEBUG] Configuring mojo 'org.apache.maven.plugins:maven-compiler-plugin:2.0:compile' -->
-[DEBUG] (f) basedir = c:\projects\maven-jboss-head\jboss-head\kernel
-[DEBUG] (f) buildDirectory = c:\projects\maven-jboss-head\jboss-head\kernel\target
-[DEBUG] (f) classpathElements = [c:\projects\maven-jboss-head\jboss-head\kernel\target\classes, C:\Documents and Settings\ruel\.m2\repository\junit\junit\3.8.1\junit-3.8.1.jar, C:\Documents and Settings\ruel\.m2\repository\apache-xerces\xml-apis\2.7.0\xml-apis-2.7.0.jar, C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\common\primary-source\primary-source\5.0-SNAPSHOT\primary-source-5.0-SNAPSHOT.jar, C:\Documents and Settings\ruel\.m2\repository\apache-log4j\snmpTrapAppender\1.2.8\snmpTrapAppender-1.2.8.jar, C:\Documents and Settings\ruel\.m2\repository\apache-log4j\log4j\1.2.8\log4j-1.2.8.jar, C:\Documents and Settings\ruel\.m2\repository\apache-xerces\resolver\2.7.0\resolver-2.7.0.jar, C:\Documents and Settings\ruel\.m2\repository\ant\ant\1.6.5\ant-1.6.5.jar, C:\Documents and Settings\ruel\.m2\repository\apache-jaxme\jaxmexs\0.2-cvs\jaxmexs-0.2-cvs.jar, C:\Documents and Settings\ruel\.m2\repository\oswego-concurrent\concurrent\1.3.4\concurrent-1.3.4.jar, C!
:\Documents and Settings\ruel\.m2\repository\org\jboss\server\test\test\5.0-SNAPSHOT\test-5.0-SNAPSHOT.jar, C:\Documents and Settings\ruel\.m2\repository\apache-slide\webdavlib\2.0\webdavlib-2.0.jar, C:\Documents and Settings\ruel\.m2\repository\wutka-dtdparser\dtdparser121\1.2.1\dtdparser121-1.2.1.jar, C:\Documents and Settings\ruel\.m2\repository\gnu-regexp\gnu-regexp\1.1.14\gnu-regexp-1.1.14.jar, C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\container\container\5.0-SNAPSHOT\container-5.0-SNAPSHOT.jar, C:\Documents and Settings\ruel\.m2\repository\dom4j\dom4j\1.5\dom4j-1.5.jar, C:\Documents and Settings\ruel\.m2\repository\apache-xerces\xercesImpl\2.7.0\xercesImpl-2.7.0.jar, C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\common\common-source\common-source\5.0-SNAPSHOT\common-source-5.0-SNAPSHOT.jar, C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\j2se\jboss-j2se\jboss-j2se\5.0-SNAPSHOT\jboss-j2se-5.0-SNAPSHOT.jar, C:\Documen!
ts and Settings\ruel\.m2\repository\org\jboss\server\dependency\depend
ency\5.0-SNAPSHOT\dependency-5.0-SNAPSHOT.jar, C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\common\testsuite-support\testsuite-support\5.0-SNAPSHOT\testsuite-support-5.0-SNAPSHOT.jar, C:\Documents and Settings\ruel\.m2\repository\jaxen\jaxen\1.1-beta-4\jaxen-1.1-beta-4.jar, C:\Documents and Settings\ruel\.m2\repository\apache-httpclient\commons-httpclient\2.0\commons-httpclient-2.0.jar]
-[DEBUG] (f) compileSourceRoots = [c:\projects\maven-jboss-head\jboss-head\kernel\src\main\java]
-[DEBUG] (f) compilerId = javac
-[DEBUG] (f) debug = true
-[DEBUG] (f) fork = false
-[DEBUG] (f) optimize = false
-[DEBUG] (f) outputDirectory = c:\projects\maven-jboss-head\jboss-head\kernel\target\classes
-[DEBUG] (f) outputFileName = kernel-5.0-SNAPSHOT
-[DEBUG] (f) projectArtifact = org.jboss.server.kernel:kernel:jar:5.0-SNAPSHOT
-[DEBUG] (f) staleMillis = 0
-[DEBUG] (f) verbose = false
-[DEBUG] -- end configuration --
-[INFO] [compiler:compile]
-[DEBUG] Using compiler 'javac'.
-[DEBUG] Source directories: [c:\projects\maven-jboss-head\jboss-head\kernel\src\main\java]
-[DEBUG] Classpath: [c:\projects\maven-jboss-head\jboss-head\kernel\target\classes
- C:\Documents and Settings\ruel\.m2\repository\junit\junit\3.8.1\junit-3.8.1.jar
- C:\Documents and Settings\ruel\.m2\repository\apache-xerces\xml-apis\2.7.0\xml-apis-2.7.0.jar
- C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\common\primary-source\primary-source\5.0-SNAPSHOT\primary-source-5.0-SNAPSHOT.jar
- C:\Documents and Settings\ruel\.m2\repository\apache-log4j\snmpTrapAppender\1.2.8\snmpTrapAppender-1.2.8.jar
- C:\Documents and Settings\ruel\.m2\repository\apache-log4j\log4j\1.2.8\log4j-1.2.8.jar
- C:\Documents and Settings\ruel\.m2\repository\apache-xerces\resolver\2.7.0\resolver-2.7.0.jar
- C:\Documents and Settings\ruel\.m2\repository\ant\ant\1.6.5\ant-1.6.5.jar
- C:\Documents and Settings\ruel\.m2\repository\apache-jaxme\jaxmexs\0.2-cvs\jaxmexs-0.2-cvs.jar
- C:\Documents and Settings\ruel\.m2\repository\oswego-concurrent\concurrent\1.3.4\concurrent-1.3.4.jar
- C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\test\test\5.0-SNAPSHOT\test-5.0-SNAPSHOT.jar
- C:\Documents and Settings\ruel\.m2\repository\apache-slide\webdavlib\2.0\webdavlib-2.0.jar
- C:\Documents and Settings\ruel\.m2\repository\wutka-dtdparser\dtdparser121\1.2.1\dtdparser121-1.2.1.jar
- C:\Documents and Settings\ruel\.m2\repository\gnu-regexp\gnu-regexp\1.1.14\gnu-regexp-1.1.14.jar
- C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\container\container\5.0-SNAPSHOT\container-5.0-SNAPSHOT.jar
- C:\Documents and Settings\ruel\.m2\repository\dom4j\dom4j\1.5\dom4j-1.5.jar
- C:\Documents and Settings\ruel\.m2\repository\apache-xerces\xercesImpl\2.7.0\xercesImpl-2.7.0.jar
- C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\common\common-source\common-source\5.0-SNAPSHOT\common-source-5.0-SNAPSHOT.jar
- C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\j2se\jboss-j2se\jboss-j2se\5.0-SNAPSHOT\jboss-j2se-5.0-SNAPSHOT.jar
- C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\dependency\dependency\5.0-SNAPSHOT\dependency-5.0-SNAPSHOT.jar
- C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\common\testsuite-support\testsuite-support\5.0-SNAPSHOT\testsuite-support-5.0-SNAPSHOT.jar
- C:\Documents and Settings\ruel\.m2\repository\jaxen\jaxen\1.1-beta-4\jaxen-1.1-beta-4.jar
- C:\Documents and Settings\ruel\.m2\repository\apache-httpclient\commons-httpclient\2.0\commons-httpclient-2.0.jar]
-[DEBUG] Output directory: c:\projects\maven-jboss-head\jboss-head\kernel\target\classes
-[DEBUG] Classpath:
-[DEBUG] c:\projects\maven-jboss-head\jboss-head\kernel\target\classes
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\junit\junit\3.8.1\junit-3.8.1.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\apache-xerces\xml-apis\2.7.0\xml-apis-2.7.0.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\common\primary-source\primary-source\5.0-SNAPSHOT\primary-source-5.0-SNAPSHOT.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\apache-log4j\snmpTrapAppender\1.2.8\snmpTrapAppender-1.2.8.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\apache-log4j\log4j\1.2.8\log4j-1.2.8.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\apache-xerces\resolver\2.7.0\resolver-2.7.0.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\ant\ant\1.6.5\ant-1.6.5.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\apache-jaxme\jaxmexs\0.2-cvs\jaxmexs-0.2-cvs.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\oswego-concurrent\concurrent\1.3.4\concurrent-1.3.4.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\test\test\5.0-SNAPSHOT\test-5.0-SNAPSHOT.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\apache-slide\webdavlib\2.0\webdavlib-2.0.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\wutka-dtdparser\dtdparser121\1.2.1\dtdparser121-1.2.1.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\gnu-regexp\gnu-regexp\1.1.14\gnu-regexp-1.1.14.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\container\container\5.0-SNAPSHOT\container-5.0-SNAPSHOT.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\dom4j\dom4j\1.5\dom4j-1.5.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\apache-xerces\xercesImpl\2.7.0\xercesImpl-2.7.0.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\common\common-source\common-source\5.0-SNAPSHOT\common-source-5.0-SNAPSHOT.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\j2se\jboss-j2se\jboss-j2se\5.0-SNAPSHOT\jboss-j2se-5.0-SNAPSHOT.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\dependency\dependency\5.0-SNAPSHOT\dependency-5.0-SNAPSHOT.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\org\jboss\server\common\testsuite-support\testsuite-support\5.0-SNAPSHOT\testsuite-support-5.0-SNAPSHOT.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\jaxen\jaxen\1.1-beta-4\jaxen-1.1-beta-4.jar
-[DEBUG] C:\Documents and Settings\ruel\.m2\repository\apache-httpclient\commons-httpclient\2.0\commons-httpclient-2.0.jar
-[DEBUG] Source roots:
-[DEBUG] c:\projects\maven-jboss-head\jboss-head\kernel\src\main\java
-Compiling 105 source files to c:\projects\maven-jboss-head\jboss-head\kernel\target\classes
-[INFO] ----------------------------------------------------------------------------
-[INFO] BUILD SUCCESSFUL
-[INFO] ----------------------------------------------------------------------------
-[INFO] Total time: 6 seconds
-[INFO] Finished at: Mon Nov 28 15:01:00 CST 2005
-[INFO] Final Memory: 3M/15M
-[INFO] ----------------------------------------------------------------------------
Modified: trunk/labs/jbossbuild/projects/jboss/kernel/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/kernel/pom.xml 2005-12-09 20:51:36 UTC (rev 1763)
+++ trunk/labs/jbossbuild/projects/jboss/kernel/pom.xml 2005-12-09 20:56:12 UTC (rev 1764)
@@ -70,9 +70,6 @@
</plugin>
</plugins>
</build>
-
- <!-- a list of sub-projects which must be built prior project.common -->
-
<dependencies>
<dependency>
<groupId>org.jboss.server.dependency</groupId>
|
|
From: <jbo...@li...> - 2005-12-09 20:51:41
|
Author: rl...@jb...
Date: 2005-12-09 15:51:36 -0500 (Fri, 09 Dec 2005)
New Revision: 1763
Removed:
trunk/labs/jbossbuild/projects/jboss/dependency/file1.txt
trunk/labs/jbossbuild/projects/jboss/dependency/jboss-5.0-SNAPSHOT/
trunk/labs/jbossbuild/projects/jboss/dependency/src-old/
Modified:
trunk/labs/jbossbuild/projects/jboss/dependency/pom.xml
Log:
cleanup
Deleted: trunk/labs/jbossbuild/projects/jboss/dependency/file1.txt
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/dependency/file1.txt 2005-12-09 20:42:42 UTC (rev 1762)
+++ trunk/labs/jbossbuild/projects/jboss/dependency/file1.txt 2005-12-09 20:51:36 UTC (rev 1763)
@@ -1,369 +0,0 @@
-/cygdrive/c/j2sdk1.4.2_08/bin/java -classpath c:\maven\maven-2.0/core/boot/classworlds-1.1-alpha-2.jar -Dclassworlds.conf=c:\maven\maven-2.0/bin/m2.conf -Dmaven.home=c:\maven\maven-2.0 org.codehaus.classworlds.Launcher compile
-[INFO] Scanning for projects...
-[INFO] ----------------------------------------------------------------------------
-[INFO] Building dependency
-[INFO] task-segment: [compile]
-[INFO] ----------------------------------------------------------------------------
-[INFO] [resources:resources]
-[INFO] Using default encoding to copy filtered resources.
-[INFO] [compiler:compile]
-Compiling 13 source files to c:\projects\maven-jboss-head\jboss-head\dependency\target\classes
-[INFO] ----------------------------------------------------------------------------
-[ERROR] BUILD FAILURE
-[INFO] ----------------------------------------------------------------------------
-[INFO] Compilation failure
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\ControllerState.java:[24,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\ControllerState.java:[25,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\ControllerState.java:[33,37] cannot resolve symbol
-symbol : class JBossObject
-location: class org.jboss.dependency.spi.ControllerState
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\ControllerState.java:[92,24] cannot resolve symbol
-symbol : class JBossStringBuilder
-location: class org.jboss.dependency.spi.ControllerState
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\Controller.java:[27,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\Controller.java:[40,36] cannot resolve symbol
-symbol : class JBossInterface
-location: interface org.jboss.dependency.spi.Controller
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\ControllerContext.java:[24,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\ControllerContext.java:[32,43] cannot resolve symbol
-symbol : class JBossInterface
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\DependencyInfo.java:[26,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\DependencyInfo.java:[34,40] cannot resolve symbol
-symbol : class JBossInterface
-location: interface org.jboss.dependency.spi.DependencyInfo
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\ControllerMode.java:[24,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\ControllerMode.java:[25,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\ControllerMode.java:[33,36] cannot resolve symbol
-symbol : class JBossObject
-location: class org.jboss.dependency.spi.ControllerMode
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\spi\ControllerMode.java:[80,24] cannot resolve symbol
-symbol : class JBossStringBuilder
-location: class org.jboss.dependency.spi.ControllerMode
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[30,25] package org.jboss.logging does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[31,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[32,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[40,44] cannot resolve symbol
-symbol : class JBossObject
-location: class org.jboss.dependency.plugins.AbstractDependencyItem
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[43,24] cannot resolve symbol
-symbol : class Logger
-location: class org.jboss.dependency.plugins.AbstractDependencyItem
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[172,24] cannot resolve symbol
-symbol : class JBossStringBuilder
-location: class org.jboss.dependency.plugins.AbstractDependencyItem
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[183,29] cannot resolve symbol
-symbol : class JBossStringBuilder
-location: class org.jboss.dependency.plugins.AbstractDependencyItem
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyInfo.java:[32,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyInfo.java:[33,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyInfo.java:[34,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyInfo.java:[42,44] cannot resolve symbol
-symbol : class JBossObject
-location: class org.jboss.dependency.plugins.AbstractDependencyInfo
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyInfo.java:[143,24] cannot resolve symbol
-symbol : class JBossStringBuilder
-location: class org.jboss.dependency.plugins.AbstractDependencyInfo
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[36,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[37,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[45,40] cannot resolve symbol
-symbol : class JBossObject
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractControllerContext.java:[33,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractControllerContext.java:[34,22] package org.jboss.util does not exist
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractControllerContext.java:[42,47] cannot resolve symbol
-symbol : class JBossObject
-location: class org.jboss.dependency.plugins.AbstractControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractControllerContext.java:[239,24] cannot resolve symbol
-symbol : class JBossStringBuilder
-location: class org.jboss.dependency.plugins.AbstractControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractControllerContext.java:[262,29] cannot resolve symbol
-symbol : class JBossStringBuilder
-location: class org.jboss.dependency.plugins.AbstractControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[43,37] cannot resolve symbol
-symbol : variable Logger
-location: class org.jboss.dependency.plugins.AbstractDependencyItem
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[120,31] reference to == is ambiguous, both method ==(int,int) in and method ==(boolean,boolean) in match
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[150,9] cannot resolve symbol
-symbol : method flushJBossObjectCache ()
-location: class org.jboss.dependency.plugins.AbstractDependencyItem
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[154,37] reference to + is ambiguous, both method +(java.lang.String,java.lang.String) in and method +(java.lang.String,int) in match
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[156,39] reference to + is ambiguous, both method +(java.lang.String,java.lang.String) in and method +(java.lang.String,int) in match
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[167,9] cannot resolve symbol
-symbol : method flushJBossObjectCache ()
-location: class org.jboss.dependency.plugins.AbstractDependencyItem
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[168,40] reference to + is ambiguous, both method +(java.lang.String,java.lang.String) in and method +(java.lang.String,int) in match
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[208,6] cannot resolve symbol
-symbol : method flushJBossObjectCache ()
-location: class org.jboss.dependency.plugins.AbstractDependencyItem
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyItem.java:[219,6] cannot resolve symbol
-symbol : method flushJBossObjectCache ()
-location: class org.jboss.dependency.plugins.AbstractDependencyItem
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyInfo.java:[45,27] cannot resolve symbol
-symbol : variable CollectionsFactory
-location: class org.jboss.dependency.plugins.AbstractDependencyInfo
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyInfo.java:[48,29] cannot resolve symbol
-symbol : variable CollectionsFactory
-location: class org.jboss.dependency.plugins.AbstractDependencyInfo
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyInfo.java:[51,28] cannot resolve symbol
-symbol : variable CollectionsFactory
-location: class org.jboss.dependency.plugins.AbstractDependencyInfo
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyInfo.java:[81,6] cannot resolve symbol
-symbol : method flushJBossObjectCache ()
-location: class org.jboss.dependency.plugins.AbstractDependencyInfo
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyInfo.java:[88,6] cannot resolve symbol
-symbol : method flushJBossObjectCache ()
-location: class org.jboss.dependency.plugins.AbstractDependencyInfo
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyInfo.java:[111,6] cannot resolve symbol
-symbol : method flushJBossObjectCache ()
-location: class org.jboss.dependency.plugins.AbstractDependencyInfo
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractDependencyInfo.java:[117,6] cannot resolve symbol
-symbol : method flushJBossObjectCache ()
-location: class org.jboss.dependency.plugins.AbstractDependencyInfo
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[48,27] cannot resolve symbol
-symbol : variable CollectionsFactory
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[51,31] cannot resolve symbol
-symbol : variable CollectionsFactory
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[54,35] cannot resolve symbol
-symbol : variable CollectionsFactory
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[57,33] cannot resolve symbol
-symbol : variable CollectionsFactory
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[88,51] reference to + is ambiguous, both method +(java.lang.String,java.lang.String) in and method +(int,java.lang.String) in match
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[92,33] cannot resolve symbol
-symbol : variable CollectionsFactory
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[104,64] reference to + is ambiguous, both method +(java.lang.String,java.lang.String) in and method +(java.lang.String,int) in match
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[136,22] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[143,66] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[153,22] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[166,22] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[176,22] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[182,9] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[189,44] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[189,9] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[212,42] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[212,9] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[217,9] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[245,62] reference to + is ambiguous, both method +(java.lang.String,java.lang.String) in and method +(java.lang.String,int) in match
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[250,92] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[250,12] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[255,77] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[255,9] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[281,79] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[284,70] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[292,48] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[292,9] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[320,69] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[320,12] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[334,93] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[347,85] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[347,9] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[397,21] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[424,15] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[430,18] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[478,51] reference to + is ambiguous, both method +(java.lang.String,java.lang.String) in and method +(java.lang.String,int) in match
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[478,9] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[483,88] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[483,9] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[487,63] reference to + is ambiguous, both method +(java.lang.String,java.lang.String) in and method +(java.lang.String,int) in match
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[487,96] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[487,9] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[509,9] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[513,132] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[547,77] reference to + is ambiguous, both method +(java.lang.String,java.lang.String) in and method +(java.lang.String,int) in match
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[561,90] cannot resolve symbol
-symbol : method toShortString ()
-location: interface org.jboss.dependency.spi.ControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractController.java:[561,9] cannot resolve symbol
-symbol : variable log
-location: class org.jboss.dependency.plugins.AbstractController
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractControllerContext.java:[171,6] cannot resolve symbol
-symbol : method flushJBossObjectCache ()
-location: class org.jboss.dependency.plugins.AbstractControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractControllerContext.java:[187,6] cannot resolve symbol
-symbol : method flushJBossObjectCache ()
-location: class org.jboss.dependency.plugins.AbstractControllerContext
-
-c:\projects\maven-jboss-head\jboss-head\dependency\src\main\java\org\jboss\dependency\plugins\AbstractControllerContext.java:[208,6] cannot resolve symbol
-symbol : method flushJBossObjectCache ()
-location: class org.jboss.dependency.plugins.AbstractControllerContext
-
-
-[INFO] ----------------------------------------------------------------------------
-[INFO] For more information, run Maven with the -e switch
-[INFO] ----------------------------------------------------------------------------
-[INFO] Total time: 1 second
-[INFO] Finished at: Mon Nov 28 14:40:43 CST 2005
-[INFO] Final Memory: 2M/10M
-[INFO] ----------------------------------------------------------------------------
Modified: trunk/labs/jbossbuild/projects/jboss/dependency/pom.xml
===================================================================
--- trunk/labs/jbossbuild/projects/jboss/dependency/pom.xml 2005-12-09 20:42:42 UTC (rev 1762)
+++ trunk/labs/jbossbuild/projects/jboss/dependency/pom.xml 2005-12-09 20:51:36 UTC (rev 1763)
@@ -46,9 +46,6 @@
</plugin>
</plugins>
</build>
-
- <!-- a list of sub-projects which must be built prior project.common -->
-
<dependencies>
<dependency>
<groupId>org.jboss.server.common</groupId>
|
|
From: <jbo...@li...> - 2005-12-09 20:42:49
|
Author: aron.gombas
Date: 2005-12-09 15:42:42 -0500 (Fri, 09 Dec 2005)
New Revision: 1762
Modified:
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/sf/SfConstants.java
Log:
Unused constant removed
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/sf/SfConstants.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/sf/SfConstants.java 2005-12-09 20:27:56 UTC (rev 1761)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/sf/SfConstants.java 2005-12-09 20:42:42 UTC (rev 1762)
@@ -16,9 +16,6 @@
* @version $Id$
*/
public class SfConstants {
- /** Base URL for SF, used to generate full URLs from the local ones. */
- public final static String SF_BASEURL = "http://www.sourceforge.net";
-
/** Dateformat used in the SF site. */
public final static DateFormat SF_FILERELEASE_DATEFORMAT = new SimpleDateFormat("MMMMMM d, yyyy");
}
|
Author: aron.gombas
Date: 2005-12-09 15:27:56 -0500 (Fri, 09 Dec 2005)
New Revision: 1761
Modified:
trunk/labs/kosmos/conf-portlet/jboss-portal/kosmos-pages.xml
trunk/labs/kosmos/conf-portlet/jboss-portal/portlet-instances.xml
trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-display.xml
trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-portlet.xml
trunk/labs/kosmos/conf-portlet/pluto/portletentityregistry.xml
trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcProject.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/cc/CcMonitoringPortlet.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/jira/JiraMonitoringPortlet.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/sf/SfMonitoringPortlet.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/svn/SvnMonitoringPortlet.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/cc/CcServiceImpl.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/sf/SfServiceImpl.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/svn/SvnServiceImpl.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/ScrapingUtils.java
trunk/labs/kosmos/web-portlet/WEB-INF/portlet.xml
trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp
Log:
CC monitoring rewritten to scrape webpages instead of local XML logs
Modified: trunk/labs/kosmos/conf-portlet/jboss-portal/kosmos-pages.xml
===================================================================
--- trunk/labs/kosmos/conf-portlet/jboss-portal/kosmos-pages.xml 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/conf-portlet/jboss-portal/kosmos-pages.xml 2005-12-09 20:27:56 UTC (rev 1761)
@@ -4,8 +4,8 @@
<page-name>Kosmos</page-name>
<window>
- <window-name>LocalCcMonitoring</window-name>
- <instance-ref>kosmos-portal.LocalCcMonitoringPortlet.LocalCcMonitoringPortletInstance</instance-ref>
+ <window-name>JBossCcMonitoring</window-name>
+ <instance-ref>kosmos-portal.JBossCcMonitoringPortlet.JBossCcMonitoringPortletInstance</instance-ref>
<default>false</default>
<region>center</region>
<height>0</height>
Modified: trunk/labs/kosmos/conf-portlet/jboss-portal/portlet-instances.xml
===================================================================
--- trunk/labs/kosmos/conf-portlet/jboss-portal/portlet-instances.xml 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/conf-portlet/jboss-portal/portlet-instances.xml 2005-12-09 20:27:56 UTC (rev 1761)
@@ -1,8 +1,8 @@
<?xml version="1.0" standalone="yes"?>
<instances>
<instance>
- <instance-name>LocalCcMonitoringPortletInstance</instance-name>
- <component-ref>LocalCcMonitoringPortlet</component-ref>
+ <instance-name>JBossCcMonitoringPortletInstance</instance-name>
+ <component-ref>JBossCcMonitoringPortlet</component-ref>
</instance>
<instance>
<instance-name>AtlassianJiraMonitoringPortletInstance</instance-name>
Modified: trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-display.xml
===================================================================
--- trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-display.xml 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-display.xml 2005-12-09 20:27:56 UTC (rev 1761)
@@ -3,7 +3,7 @@
<display>
<category name="category.development">
- <portlet id="LocalCcMonitoringPortlet" />
+ <portlet id="JBossCcMonitoringPortlet" />
<portlet id="JBossJiraMonitoringPortlet" />
<portlet id="KosmosDependenciesSfMonitoringPortlet" />
<portlet id="KosmosToolsSfMonitoringPortlet" />
Modified: trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-portlet.xml
===================================================================
--- trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-portlet.xml 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/conf-portlet/liferay-portal/liferay-portlet.xml 2005-12-09 20:27:56 UTC (rev 1761)
@@ -3,7 +3,7 @@
<liferay-portlet-app>
<portlet>
- <portlet-name>LocalCcMonitoringPortlet</portlet-name>
+ <portlet-name>JBossCcMonitoringPortlet</portlet-name>
<struts-path>cruise</struts-path>
<use-default-template>true</use-default-template>
<include>true</include>
Modified: trunk/labs/kosmos/conf-portlet/pluto/portletentityregistry.xml
===================================================================
--- trunk/labs/kosmos/conf-portlet/pluto/portletentityregistry.xml 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/conf-portlet/pluto/portletentityregistry.xml 2005-12-09 20:27:56 UTC (rev 1761)
@@ -1,7 +1,7 @@
<application id="6">
<definition-id>kosmos-portlet</definition-id>
<portlet id="0">
- <definition-id>kosmos-portlet.LocalCcMonitoringPortlet</definition-id>
+ <definition-id>kosmos-portlet.JBossCcMonitoringPortlet</definition-id>
</portlet>
<portlet id="1">
<definition-id>kosmos-portlet.JBossJiraMonitoringPortlet</definition-id>
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcProject.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcProject.java 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcProject.java 2005-12-09 20:27:56 UTC (rev 1761)
@@ -18,6 +18,8 @@
public class CcProject extends Identified {
/** Name of the project. */
private String name;
+ /** URL of the build result page. */
+ private String buildResultUrl;
/** Label of the latest build. */
private String buildLabel;
/** Status of the latest build. */
@@ -50,13 +52,14 @@
super(null);
}
- public CcProject(String name, String buildLabel, int status, Date timestamp,
+ public CcProject(String name, String buildResultUrl, String buildLabel, int status, Date timestamp,
int modifications, String buildTime,
int tests, int errors, int failures, List<CcTest> testCases,
String testsPerCategoryChartUrl) {
super(name + buildLabel + timestamp.getTime());
this.name = name;
+ this.buildResultUrl = buildResultUrl;
this.buildLabel = buildLabel;
this.status = status;
this.timestamp = timestamp;
@@ -76,6 +79,10 @@
return name;
}
+ public String getBuildResultUrl() {
+ return buildResultUrl;
+ }
+
public String getBuildLabel() {
return buildLabel;
}
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/cc/CcMonitoringPortlet.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/cc/CcMonitoringPortlet.java 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/cc/CcMonitoringPortlet.java 2005-12-09 20:27:56 UTC (rev 1761)
@@ -36,16 +36,16 @@
public class CcMonitoringPortlet extends AbstractKosmosPortlet {
private final static Log log = LogFactory.getLog(CcMonitoringPortlet.class);
- private List<String> monitoredDirs = null;
+ private List<String> monitoredUrls = null;
@Override
public void init(PortletConfig config) throws PortletException {
log.info("Initializing...");
super.init(config);
- monitoredDirs = PortletUtils.breakCommaSeparatedString(config.getInitParameter("monitored.dirs"));
- if(monitoredDirs == null)
- throw new IllegalStateException("'monitored.dirs' was not specified in the init-params");
+ monitoredUrls = PortletUtils.breakCommaSeparatedString(config.getInitParameter("monitored.urls"));
+ if(monitoredUrls == null)
+ throw new IllegalStateException("'monitored.urls' was not specified in the init-params");
}
@Override
@@ -61,7 +61,7 @@
CcService service = null;
HessianProxyFactory factory = new HessianProxyFactory();
try {
- service = (CcService) factory.create(CcService.class, serviceUrl);
+ service = (CcService)factory.create(CcService.class, serviceUrl);
} catch (MalformedURLException ex) {
log.error("Unable to connect to the service", ex);
}
@@ -70,7 +70,7 @@
Date timestamp = null;
List<CcProject> projects = null;
if(service != null) {
- for(String monitoredDir : monitoredDirs) {
+ for(String monitoredDir : monitoredUrls) {
if(projects == null)
projects = service.getProjects(monitoredDir);
else
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/jira/JiraMonitoringPortlet.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/jira/JiraMonitoringPortlet.java 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/jira/JiraMonitoringPortlet.java 2005-12-09 20:27:56 UTC (rev 1761)
@@ -61,7 +61,7 @@
JiraService service = null;
HessianProxyFactory factory = new HessianProxyFactory();
try {
- service = (JiraService) factory.create(JiraService.class, serviceUrl);
+ service = (JiraService)factory.create(JiraService.class, serviceUrl);
} catch (MalformedURLException ex) {
log.error("Unable to connect to the service", ex);
}
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/sf/SfMonitoringPortlet.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/sf/SfMonitoringPortlet.java 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/sf/SfMonitoringPortlet.java 2005-12-09 20:27:56 UTC (rev 1761)
@@ -60,7 +60,7 @@
SfService service = null;
HessianProxyFactory factory = new HessianProxyFactory();
try {
- service = (SfService) factory.create(SfService.class, serviceUrl);
+ service = (SfService)factory.create(SfService.class, serviceUrl);
} catch (MalformedURLException ex) {
log.error("Unable to connect to the service", ex);
}
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/svn/SvnMonitoringPortlet.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/svn/SvnMonitoringPortlet.java 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/portlet/svn/SvnMonitoringPortlet.java 2005-12-09 20:27:56 UTC (rev 1761)
@@ -61,7 +61,7 @@
SvnService service = null;
HessianProxyFactory factory = new HessianProxyFactory();
try {
- service = (SvnService) factory.create(SvnService.class, serviceUrl);
+ service = (SvnService)factory.create(SvnService.class, serviceUrl);
} catch (MalformedURLException ex) {
log.error("Unable to connect to the service", ex);
}
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/cc/CcServiceImpl.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/cc/CcServiceImpl.java 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/cc/CcServiceImpl.java 2005-12-09 20:27:56 UTC (rev 1761)
@@ -19,8 +19,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FilenameFilter;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -34,6 +33,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
+import org.w3c.dom.Node;
/**
* Implementation of the <i>CruiseControl</i> service.
@@ -66,41 +66,43 @@
* </ul>
*/
private class CcDataHandler implements CachedDataHandler {
- /**
- * Last-modified value of the logfile processed during the latest reload,
- * needed to avoid unnecessary reloads.
- */
- private long previousLatestLogModified = -1;
-
- /**
- * Returns <code>true</code> if the latest logfile is the same
- * like the one already processed during the latest reload.
- */
+ /** TODO this should download the page and look for the latest build date */
public boolean isDataUptodate(Object key) {
- String dir = key.toString();
- return (findLatestLog(dir).lastModified() == previousLatestLogModified);
+ return false;
}
- public Object reloadData(Object key) {
- String dir = key.toString();
+ @SuppressWarnings("unchecked")
+ public Object reloadData(Object key) {
+ String url = key.toString();
List<CcProject> projects = new ArrayList<CcProject>();
- try {
- // scrape log
- File latestLog = findLatestLog(dir);
- Document dom = ScrapingUtils.downloadXmlDom(latestLog.toURL());
+ try {
+ Document dom = ScrapingUtils.downloadHtmlDom(new URL(url));
+
+ // scrape "XML Log File" link from the "Build Results" page and download it
+ Node aNode = ScrapingUtils.findDomNodeByAttribute(dom.getElementsByTagName("a"), "href", "tab=xmlLogFile");
+ String xmlLogPageUrl = ScrapingUtils.getBaseUrl(url) + aNode.getAttributes().getNamedItem("href").getNodeValue();
+ log.debug(String.format("Going to XML log page at \"%s\"", xmlLogPageUrl));
+ Document xmlLogPageDom = ScrapingUtils.downloadHtmlDom(new URL(xmlLogPageUrl));
+
+ // scrape embedded XML log
+ Node preNode = ScrapingUtils.findDomNodeByAttribute(xmlLogPageDom.getElementsByTagName("pre"), "class", "modifications-data");
+ String xmlLog = preNode.getFirstChild().getNodeValue();
+ log.debug(String.format("XML log of length %d found", xmlLog.length()));
// scape "global" properties
- String name = ScrapingUtils.runXQueryString(dom, "<dummy> { data(//property[@name='projectname']/@value) } </dummy>");
- String buildLabel = ScrapingUtils.runXQueryString(dom, "<dummy> { data(//property[@name='label']/@value) } </dummy>");
- int status = (ScrapingUtils.runXQueryString(dom, "<dummy> { data(//build/@error) } </dummy>").length() == 0) ? CcBuildStatus.SUCCEEDED : CcBuildStatus.FAILED;
- Date timestamp = CcConstants.CC_BUILD_DATEFORMAT.parse(ScrapingUtils.runXQueryString(dom, "<dummy> { data(//property[@name='lastbuild']/@value) } </dummy>"));
- int modifications = ScrapingUtils.runXQueryInt(dom, "<dummy> { data(count(//modification)) } </dummy>");
- String buildTime = ScrapingUtils.runXQueryString(dom, "<dummy> { data(//build/@time) } </dummy>");// TODO if we keep it as String, that cannot be localized -> should be intelligently parsed (using a Duration class maybe?) and stored as Object
- int tests = ScrapingUtils.runXQueryInt(dom, "<dummy> { data(count(//testcase)) } </dummy>");
- int errors = ScrapingUtils.runXQueryInt(dom, "<dummy> { data(count(//testcase/error)) } </dummy>");
- int failures = ScrapingUtils.runXQueryInt(dom, "<dummy> { data(count(//testcase/failure)) } </dummy>");
+ Document xmlLogDom = ScrapingUtils.parseStringDom(xmlLog);
+ String name = ScrapingUtils.runXQueryString(xmlLogDom, "<dummy> { data(//property[@name='projectname']/@value) } </dummy>");
+ String buildLabel = ScrapingUtils.runXQueryString(xmlLogDom, "<dummy> { data(//property[@name='label']/@value) } </dummy>");
+ int status = (ScrapingUtils.runXQueryString(xmlLogDom, "<dummy> { data(//build/@error) } </dummy>").length() == 0) ? CcBuildStatus.SUCCEEDED : CcBuildStatus.FAILED;
+ Date timestamp = CcConstants.CC_BUILD_DATEFORMAT.parse(ScrapingUtils.runXQueryString(xmlLogDom, "<dummy> { data(//property[@name='cctimestamp']/@value) } </dummy>"));
+ int modifications = ScrapingUtils.runXQueryInt(xmlLogDom, "<dummy> { data(count(//modification)) } </dummy>");
+ String buildTime = ScrapingUtils.runXQueryString(xmlLogDom, "<dummy> { data(//build/@time) } </dummy>");// TODO if we keep it as String, that cannot be localized -> should be intelligently parsed (using a Duration class maybe?) and stored as Object
+ int tests = ScrapingUtils.runXQueryInt(xmlLogDom, "<dummy> { data(count(//testcase)) } </dummy>");
+ int errors = ScrapingUtils.runXQueryInt(xmlLogDom, "<dummy> { data(count(//testcase/error)) } </dummy>");
+ int failures = ScrapingUtils.runXQueryInt(xmlLogDom, "<dummy> { data(count(//testcase/failure)) } </dummy>");
+
// scrape testcases
List<CcTest> testCases = new ArrayList<CcTest>();
String query =
@@ -114,7 +116,7 @@
"{ count($d/error) }" +
"</dummy>";
- List result = ScrapingUtils.runXQuery(dom, query);
+ List result = ScrapingUtils.runXQuery(xmlLogDom, query);
for(Iterator it = result.iterator(); it.hasNext();) {
String value = ScrapingUtils.eliminateEmptyValues(((NodeInfo)it.next()).getStringValue());
log.debug(String.format("Scraped testcase: \"%s\"", value));
@@ -143,13 +145,12 @@
ByteArrayOutputStream out = new ByteArrayOutputStream();
ChartUtils.writeChartAsPng(ChartUtils.generateColorCodedPieChart(ChartUtils.collectionToPieDataset(testsPerCategory)), out);
- String testsPerCategoryChartUrl = storeFile(dir + "_tests_per_category.png", new ByteArrayInputStream(out.toByteArray()));
+ String testsPerCategoryChartUrl = storeFile(url + "_tests_per_category.png", new ByteArrayInputStream(out.toByteArray()));
// save
- previousLatestLogModified = latestLog.lastModified();
- CcProject project = new CcProject(name, buildLabel, status, timestamp,
+ CcProject project = new CcProject(name, url, buildLabel, status, timestamp,
modifications, buildTime,
- tests, errors, failures, testCases,
+ tests, errors, failures, trimList(testCases),
testsPerCategoryChartUrl);
log.debug(String.format("Adding %s...", project));
projects.add(project);
@@ -159,29 +160,5 @@
return projects;
}
-
- /** Finds the latest <i>CruiseControl</i> logfile in the dir. */
- protected File findLatestLog(String dirName) {
- File monitoredDir = new File(dirName);
- if(!monitoredDir.isDirectory())
- throw new IllegalArgumentException(String.format("Unable to process CruiseControl logs from \"%s\"", monitoredDir));
- File files[] = monitoredDir.listFiles(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return name.endsWith(".xml");
- }
- });
-
- // find latest
- File latestLog = null;
- long latestLogModified = -1;
- for(File file : files) {
- if(file.lastModified() > latestLogModified) {
- latestLog = file;
- latestLogModified = file.lastModified();
- }
- }
-
- return latestLog;
- }
}
}
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java 2005-12-09 20:27:56 UTC (rev 1761)
@@ -281,7 +281,7 @@
*/
protected void connect(String url) throws MalformedURLException {
// authenticate if project is secured
- String userInfo[] = ScrapingUtils.parseUserInfo(url);
+ String userInfo[] = ScrapingUtils.parseUserInfoFromUrl(url);
if(userInfo != null) {
String userName = userInfo[0];
String password = userInfo[1];
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/sf/SfServiceImpl.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/sf/SfServiceImpl.java 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/sf/SfServiceImpl.java 2005-12-09 20:27:56 UTC (rev 1761)
@@ -60,13 +60,13 @@
Document dom = ScrapingUtils.downloadHtmlDom(new URL(url));
// scrape "Files" link from the "Summary" page and download it
- Node aNode = findNodeByAttribute(dom.getElementsByTagName("a"), "href", "/project/showfiles.php?group_id=");
- String filesPageUrl = SfConstants.SF_BASEURL + aNode.getAttributes().getNamedItem("href").getNodeValue();
- log.debug(String.format("Going to project file releases page at \"%s\"", filesPageUrl));
+ Node aNode = ScrapingUtils.findDomNodeByAttribute(dom.getElementsByTagName("a"), "href", "/project/showfiles.php?group_id=");
+ String filesPageUrl = ScrapingUtils.getBaseUrl(url) + aNode.getAttributes().getNamedItem("href").getNodeValue();// TODO use ScrapingUtils.getBaseUrl instead of the constant
+ log.debug(String.format("Going to project file releases page at \"%s\"...", filesPageUrl));
Document filesPageDom = ScrapingUtils.downloadHtmlDom(new URL(filesPageUrl));
- // look for "frelease" table
- Node releasesTableNode = findNodeByAttribute(filesPageDom.getElementsByTagName("table"), "id", "frelease");
+ // scrape "frelease" table
+ Node releasesTableNode = ScrapingUtils.findDomNodeByAttribute(filesPageDom.getElementsByTagName("table"), "id", "frelease");
NodeList trNodes = releasesTableNode.getLastChild().getChildNodes();
for(int j = 0; j < trNodes.getLength(); j++) {
Node trNode = trNodes.item(j);
@@ -75,9 +75,9 @@
Node tdNode = trNode.getFirstChild().getNextSibling().getNextSibling();
String packageName = a0Node.getFirstChild().getNodeValue();
- String packageUrl = SfConstants.SF_BASEURL + a0Node.getAttributes().getNamedItem("href").getNodeValue();
+ String packageUrl = ScrapingUtils.getBaseUrl(url) + a0Node.getAttributes().getNamedItem("href").getNodeValue();
String version = a1Node.getFirstChild().getNodeValue();;
- String versionUrl = SfConstants.SF_BASEURL + a1Node.getAttributes().getNamedItem("href").getNodeValue();
+ String versionUrl = ScrapingUtils.getBaseUrl(url) + a1Node.getAttributes().getNamedItem("href").getNodeValue();
Date date = SfConstants.SF_FILERELEASE_DATEFORMAT.parse(tdNode.getFirstChild().getNodeValue());
SfRelease release = new SfRelease(packageName, packageUrl, version, versionUrl, date);
@@ -92,23 +92,6 @@
}
return releases;
- }
-
- /**
- * Returns the node with the given attribute value from the given list or
- * <code>null</code> if not found.
- */
- protected Node findNodeByAttribute(NodeList nodes, String attribName, String attribValue) {
- for(int i = 0; i < nodes.getLength(); i++) {
- Node node = nodes.item(i);
- Node attrib = node.getAttributes().getNamedItem(attribName);
- if(attrib == null)
- continue;
- if(attrib.getNodeValue().indexOf(attribValue) != -1)
- return node;
- }
-
- return null;
- }
+ }
}
}
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/svn/SvnServiceImpl.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/svn/SvnServiceImpl.java 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/svn/SvnServiceImpl.java 2005-12-09 20:27:56 UTC (rev 1761)
@@ -120,7 +120,7 @@
logStats.committersTotal.size(), logStats.committersToday.size(), logStats.committersLast7Days.size(), logStats.committersLast31Days.size(),
logStats.commitsPerAuthorChartUrl, logStats.commitsPerFileChartUrl, logStats.commitsPerWeekChartUrl, logStats.repoEntriesPerWeekChartUrl,
contentStats.dirs, contentStats.files, contentStats.totalSize,
- (List<Map.Entry<String, Integer>>)trimList(logStats.commitsPerAuthor), (List<Map.Entry<String, Integer>>)trimList(logStats.commitsPerFile));
+ trimList(logStats.commitsPerAuthor), trimList(logStats.commitsPerFile));
log.debug(String.format("Adding %s...", repository));
repositories.add(repository);
} catch (Exception ex) {
@@ -144,7 +144,7 @@
SVNRepository repo = SVNRepositoryFactory.create(svnUrl);
// authenticate if repository is secured
- String userInfo[] = ScrapingUtils.parseUserInfo(svnUrl.toString());
+ String userInfo[] = ScrapingUtils.parseUserInfoFromUrl(svnUrl.toString());
if(userInfo != null) {
String userName = userInfo[0];
String password = userInfo[1];
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/ScrapingUtils.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/ScrapingUtils.java 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/util/ScrapingUtils.java 2005-12-09 20:27:56 UTC (rev 1761)
@@ -6,6 +6,7 @@
*/
package hu.midori.kosmos.server.util;
+import java.io.ByteArrayInputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;
@@ -23,6 +24,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import org.w3c.tidy.Tidy;
/**
@@ -37,30 +40,55 @@
/** This class should never be instantiated. */
protected ScrapingUtils() { }
+ /** Parses an XML document from the given string. */
+ public static Document parseStringDom(String xmlString) throws Exception {
+ log.debug(String.format("Parsing DOM from %d long string...", xmlString.length()));
+
+ //return DocumentBuilderFactoryImpl.class.newInstance().newDocumentBuilder().parse(new StringBufferInputStream(xmlString));
+ return DocumentBuilderFactoryImpl.class.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(xmlString.getBytes()));
+ }
+
+ /** Downloads an XML document from the given URL and returns it as DOM. */
+ public static Document downloadXmlDom(URL url) throws Exception {
+ log.debug(String.format("Downloading DOM from %s...", url.toString()));
+
+ Document dom = DocumentBuilderFactoryImpl.class.newInstance().newDocumentBuilder().parse(url.openStream());
+ log.debug(String.format("DOM top-level children: %d", dom.getChildNodes().getLength()));
+
+ return dom;
+ }
+
/** Downloads and tidies up an HTML document from the given URL and returns it as DOM. */
public static Document downloadHtmlDom(URL url) throws Exception {
- log.debug("Downloading HTML DOM from " + url + "...");
+ log.debug(String.format("Downloading HTML DOM from %s...", url.toString()));
Tidy tidy = new Tidy();
tidy.setQuiet(true);
tidy.setShowWarnings(false);
tidy.setXmlTags(false);
Document dom = tidy.parseDOM(url.openStream(), null);
- log.debug("DOM top-level children: " + dom.getChildNodes().getLength());
+ log.debug(String.format("DOM top-level children: %d", dom.getChildNodes().getLength()));
return dom;
}
- /** Downloads an XML document from the given URL and returns it as DOM. */
- public static Document downloadXmlDom(URL url) throws Exception {
- log.debug("Downloading DOM from " + url + "...");
+ /**
+ * Returns the node with the given attribute value from the given list or
+ * <code>null</code> if not found.
+ */
+ public static Node findDomNodeByAttribute(NodeList nodes, String attribName, String attribValue) {
+ for(int i = 0; i < nodes.getLength(); i++) {
+ Node node = nodes.item(i);
+ Node attrib = node.getAttributes().getNamedItem(attribName);
+ if(attrib == null)
+ continue;
+ if(attrib.getNodeValue().indexOf(attribValue) != -1)
+ return node;
+ }
+
+ return null;
+ }
- Document dom = DocumentBuilderFactoryImpl.newInstance().newDocumentBuilder().parse(url.openStream());
- log.debug("DOM top-level children: " + dom.getChildNodes().getLength());
-
- return dom;
- }
-
/** Runs an XQuery on the given DOM and returns the full result. */
public static List runXQuery(Document dom, String query) throws XPathException {
Configuration configuration = new Configuration();
@@ -86,6 +114,11 @@
return ((NodeInfo)list.get(0)).getStringValue();
}
+ /** Returns the "base part" (the part that doesn't contain the path and query parts) of the given URL. */
+ public static String getBaseUrl(String url) throws MalformedURLException {
+ return url.substring(0, url.indexOf(new URL(url).getPath()));
+ }
+
/**
* Removes the userinfo part from the given URL.
* @return the truncated URL.
@@ -98,7 +131,7 @@
}
/** Returns a two-element array with the username and password from the given URL, or <code>null</code> if those are not specified in the URL. */
- public static String[] parseUserInfo(String url) throws MalformedURLException {
+ public static String[] parseUserInfoFromUrl(String url) throws MalformedURLException {
String userInfo = new URL(url).getUserInfo();
if(StringUtils.isBlank(userInfo))
return null;
@@ -113,7 +146,7 @@
return strings;
}
-
+
/**
* Eliminates the empty items from a scraped value string to make
* the tokenizer happy. E.g. <code>||xxx|</code> will be transformed to <code> | |xxx| </code>.
Modified: trunk/labs/kosmos/web-portlet/WEB-INF/portlet.xml
===================================================================
--- trunk/labs/kosmos/web-portlet/WEB-INF/portlet.xml 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/web-portlet/WEB-INF/portlet.xml 2005-12-09 20:27:56 UTC (rev 1761)
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
<portlet>
- <portlet-name>LocalCcMonitoringPortlet</portlet-name>
+ <portlet-name>JBossCcMonitoringPortlet</portlet-name>
<portlet-class>hu.midori.kosmos.portlet.cc.CcMonitoringPortlet</portlet-class>
<init-param>
<name>monitored.resource</name>
@@ -14,24 +14,38 @@
<value>http://localhost:8080/kosmos-server/kosmos-services/cc-service</value>
</init-param>
<init-param>
- <name>monitored.dirs</name><!-- replace these with your local CruiseControl log dir paths -->
+ <name>monitored.urls</name>
<value>
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/ais,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/cargo-m2-trunk,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/commons-math,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/frifinans,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/gridportlets,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/gridsphere,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/gvlam,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/jboss-3.2,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/jboss-remoting,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/log4rss,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/mobicents-dailytckrun,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/mock-apis-trunk,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/openpacs,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/scarab-mysql,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/scarab-pgsql,
- /!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/weta-dfs
+ http://cruisecontrol.jboss.com/cc/buildresults/ejb3-4.0-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/ejb3-head-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/hibernate-db-matrix,
+ http://cruisecontrol.jboss.com/cc/buildresults/hibernate-hsqldb-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/hibernate-mysql-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/hibernate-oracle10-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/hibernate-sqlserver-jtds-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/hibernate-sybase-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/hibernate-timesten-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-3.2-jdk-matrix,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-3.2-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-4.0-jdk-matrix,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-4.0-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-cache,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-cache-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-head-jdk-matrix,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-head-repository,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-head-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-head-testsuite-1.4,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-head-testsuite-1.5,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-portal-2.0-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-portal-2.2-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-remoting-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-remoting-testsuite-1.4,
+ http://cruisecontrol.jboss.com/cc/buildresults/jboss-remoting-testsuite-1.5,
+ http://cruisecontrol.jboss.com/cc/buildresults/jbosside,
+ http://cruisecontrol.jboss.com/cc/buildresults/jbosslabs,
+ http://cruisecontrol.jboss.com/cc/buildresults/jbpm.3,
+ http://cruisecontrol.jboss.com/cc/buildresults/jms-head-testsuite,
+ http://cruisecontrol.jboss.com/cc/buildresults/microcontainer-head-testsuite
</value>
</init-param>
<supports>
Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp 2005-12-09 18:43:50 UTC (rev 1760)
+++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp 2005-12-09 20:27:56 UTC (rev 1761)
@@ -18,7 +18,9 @@
</c:otherwise>
</c:choose>
</display:column>
- <display:column titleKey="ccproject.name" property="name" sortable="true"/>
+ <display:column titleKey="ccproject.name" sortProperty="name" sortable="true">
+ <a href="<c:out value="${projectsIt.buildResultUrl}"/>"><c:out value="${projectsIt.name}"/></a>
+ </display:column>
<display:column titleKey="ccproject.lastBuildLabel" sortProperty="buildLabel" sortable="true">
<c:out value="${projectsIt.buildLabel}"/>
(<fmt:formatNumber value="${projectsIt.modifications}"/> <fmt:message key="ccproject.modifications"/>)
|
|
From: <jbo...@li...> - 2005-12-09 18:43:54
|
Author: rl...@jb... Date: 2005-12-09 13:43:50 -0500 (Fri, 09 Dec 2005) New Revision: 1760 Modified: trunk/labs/jbossbuild/projects/maven-plugins/maven-clean-plugin/pom.xml Log: change version number to 2.0-jboss Modified: trunk/labs/jbossbuild/projects/maven-plugins/maven-clean-plugin/pom.xml =================================================================== --- trunk/labs/jbossbuild/projects/maven-plugins/maven-clean-plugin/pom.xml 2005-12-09 18:08:10 UTC (rev 1759) +++ trunk/labs/jbossbuild/projects/maven-plugins/maven-clean-plugin/pom.xml 2005-12-09 18:43:50 UTC (rev 1760) @@ -8,6 +8,6 @@ <artifactId>maven-clean-plugin</artifactId> <packaging>maven-plugin</packaging> <name>Maven Clean Plugin</name> - <version>2.0.1-SNAPSHOT</version> + <version>2.0-jboss</version> <inceptionYear>2001</inceptionYear> </project> \ No newline at end of file |
|
From: <jbo...@li...> - 2005-12-09 18:08:20
|
Author: aron.gombas
Date: 2005-12-09 13:08:10 -0500 (Fri, 09 Dec 2005)
New Revision: 1759
Modified:
trunk/labs/kosmos/conf-portlet/exo/web.xml
Log:
eXo webapp name fixed
Modified: trunk/labs/kosmos/conf-portlet/exo/web.xml
===================================================================
--- trunk/labs/kosmos/conf-portlet/exo/web.xml 2005-12-09 17:07:45 UTC (rev 1758)
+++ trunk/labs/kosmos/conf-portlet/exo/web.xml 2005-12-09 18:08:10 UTC (rev 1759)
@@ -6,7 +6,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-app_2_4.xsd"
version="2.4">
- <display-name>kosmos-portlet.war</display-name><!-- required to be identical with the web-app name, by eXo -->
+ <display-name>kosmos-portlet</display-name><!-- required to be identical with the web-app name, by eXo -->
<description>Kosmos is a portlet-based web application. It can run only inside a portlet container.</description>
<!-- JSTL configuration -->
|
|
From: <jbo...@li...> - 2005-12-09 17:08:04
|
Author: adamw Date: 2005-12-09 12:07:45 -0500 (Fri, 09 Dec 2005) New Revision: 1758 Modified: trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/Resource.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/AbstractSvnResource.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnDirectoryProxy.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnNodeProxy.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnRepoNode.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnResourceProxy.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnService.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/operations/CopyDirectoryOperation.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnRepository.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnServiceImpl.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/DummyService.java trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/PropertiesTest.java Log: http://jira.jboss.com/jira/browse/JBSHOTOKU-40 http://jira.jboss.com/jira/browse/JBSHOTOKU-43 http://jira.jboss.com/jira/browse/JBSHOTOKU-13 Bug fixes Modified: trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/Resource.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/Resource.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-base/src/java/org/jboss/shotoku/Resource.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -72,7 +72,7 @@ * @return A map of properties associated with this resource. * @throws RepositoryException */ - public Map<String, String> getAllProperties() throws RepositoryException; + public Map<String, String> getProperties() throws RepositoryException; /** * Gets the value of the given property. Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/AbstractSvnResource.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/AbstractSvnResource.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/AbstractSvnResource.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -169,7 +169,7 @@ return getPropertyInternal(name); } - public Map<String, String> getAllProperties() { + public Map<String, String> getProperties() { Map<String, String> ret = getAllPropertiesInternal(); ret.putAll(modifiedProperties); Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnDirectoryProxy.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnDirectoryProxy.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnDirectoryProxy.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -22,7 +22,6 @@ package org.jboss.shotoku.svn; import java.util.List; -import java.util.Map; import org.jboss.shotoku.Directory; import org.jboss.shotoku.Node; @@ -119,11 +118,6 @@ currentDirectory.moveTo(dir, logMessage); } - public Map<String, String> getAllProperties() throws RepositoryException { - checkSwitch(); - return currentDirectory.getAllProperties(); - } - public void copyTo(Directory dir, String newName, String logMessage) throws CopyException { currentDirectory.copyTo(dir, newName, logMessage); Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnNodeProxy.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnNodeProxy.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnNodeProxy.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -24,7 +24,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Date; -import java.util.Map; import org.jboss.shotoku.Directory; import org.jboss.shotoku.History; @@ -169,9 +168,4 @@ throws CopyException { currentNode.copyTo(dir, newName, logMessage); } - - public Map<String, String> getAllProperties() throws RepositoryException { - checkSwitch(); - return currentNode.getAllProperties(); - } } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnRepoNode.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnRepoNode.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnRepoNode.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -25,6 +25,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import org.jboss.shotoku.exceptions.RepositoryException; @@ -98,6 +99,14 @@ SvnTools.getNodeContent(getFullPath(), -1, getSvnCm(), baos, properties); + // Filtering out any svn: properties. + for (Iterator<String> iter = properties.keySet().iterator(); + iter.hasNext();) { + if (iter.next().startsWith("svn:")) { + iter.remove(); + } + } + if (repoContent) { setNodeContent(new NodeContent(baos.toByteArray())); } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnResourceProxy.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnResourceProxy.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnResourceProxy.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -244,4 +244,9 @@ public void setProperty(String name, String value) { currentResource.setProperty(name, value); } + + public Map<String, String> getProperties() throws RepositoryException { + checkSwitch(); + return currentResource.getProperties(); + } } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnService.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnService.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/SvnService.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -64,6 +64,32 @@ public boolean isNodeModified(String id, String fullPath); /** + * Tells the service that a whole tree at the given path was modified + * (for example, moved or copied) and it should be read from the + * repository, until the WC is updated (adds this + * path to a "dirty set"). + * + * @param id + * Id of the repository. + * @param fullPath + * Full path to the modified tree. + */ + public void addTreeToModfied(String id, String fullPath); + + /** + * Checks if a the given path isn't in a modified tree and should be read + * straight from the repository (in other words, if it is in a + * "dirty set"). + * + * @param id + * Id of the repository. + * @param fullPath + * Full path to the resource to be checked. + * @return + */ + public boolean isTreeModified(String id, String fullPath); + + /** * Tells the service that a directory at the given path was modified and it * should be read from the repository, until the WC is updated (adds this * path to a "dirty set"). Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/operations/CopyDirectoryOperation.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/operations/CopyDirectoryOperation.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/operations/CopyDirectoryOperation.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -55,7 +55,6 @@ } public void addModifiedPaths(SvnService service) { - service.addDirectoryToModfied(id, destParentPath); - service.addDirectoryToModfied(id, destPath); + service.addTreeToModfied(id, destParentPath); } } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnRepository.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnRepository.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnRepository.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -53,9 +53,11 @@ private File wc; private Set<String> modifiedFiles; private Set<String> modifiedDirs; + private Set<String> modifiedTrees; private Set<String> deletedResources; private Set<String> frozenModifiedFiles; private Set<String> frozenModifiedDirs; + private Set<String> frozenModifiedTrees; private Set<String> frozenDeletedResources; private Object synchronizer; @@ -82,10 +84,12 @@ synchronizer = new Object(); + modifiedTrees = new HashSet<String>(); modifiedFiles = new HashSet<String>(); modifiedDirs = new HashSet<String>(); deletedResources = new HashSet<String>(); + frozenModifiedTrees = new HashSet<String>(); frozenModifiedFiles = new HashSet<String>(); frozenModifiedDirs = new HashSet<String>(); frozenDeletedResources = new HashSet<String>(); @@ -145,6 +149,9 @@ frozenModifiedDirs = modifiedDirs; modifiedDirs = new HashSet<String>(); + frozenModifiedTrees = modifiedTrees; + modifiedTrees = new HashSet<String>(); + frozenDeletedResources = deletedResources; deletedResources = new HashSet<String>(); } @@ -185,6 +192,7 @@ frozenDeletedResources.clear(); frozenModifiedFiles.clear(); frozenModifiedDirs.clear(); + frozenModifiedTrees.clear(); } } @@ -206,16 +214,18 @@ */ deleteFromSet(modifiedFiles, suffFullPath); deleteFromSet(modifiedDirs, suffFullPath); + deleteFromSet(modifiedTrees, suffFullPath); deleteFromSet(frozenModifiedFiles, suffFullPath); deleteFromSet(frozenModifiedDirs, suffFullPath); + deleteFromSet(frozenModifiedTrees, suffFullPath); deletedResources.add(suffFullPath); } } - private boolean checkDelete(Set<String> resources, String pathToCheck) { - for (String deletedPath : resources) { - if (pathToCheck.startsWith(deletedPath)) { + private boolean checkPrefixes(Set<String> resources, String path) { + for (String prefix : resources) { + if (path.startsWith(prefix)) { return true; } } @@ -236,8 +246,8 @@ String suffFullPath = Tools.concatenatePaths(fullPath, ""); synchronized (synchronizer) { - if (checkDelete(deletedResources, suffFullPath) || - checkDelete(frozenDeletedResources, suffFullPath)) { + if (checkPrefixes(deletedResources, suffFullPath) || + checkPrefixes(frozenDeletedResources, suffFullPath)) { return true; } } @@ -246,7 +256,9 @@ } public boolean isModified(String fullPath) { - return isNodeModified(fullPath) || isDirectoryModified(fullPath); + return isNodeModified(fullPath, false) || + isDirectoryModified(fullPath, false) || + isTreeModified(fullPath); } public void addNodeToModfied(String fullPath) { @@ -267,11 +279,16 @@ } public boolean isNodeModified(String fullPath) { + return isNodeModified(fullPath, true); + } + + public boolean isNodeModified(String fullPath, boolean checkTree) { String suffFullPath = Tools.concatenatePaths(fullPath, ""); synchronized (synchronizer) { return modifiedFiles.contains(suffFullPath) || - frozenModifiedFiles.contains(suffFullPath); + frozenModifiedFiles.contains(suffFullPath) || + (checkTree && isTreeModified(fullPath)); } } @@ -284,11 +301,37 @@ } public boolean isDirectoryModified(String fullPath) { + return isDirectoryModified(fullPath, true); + } + + public boolean isDirectoryModified(String fullPath, boolean checkTree) { String suffFullPath = Tools.concatenatePaths(fullPath, ""); synchronized (synchronizer) { return modifiedDirs.contains(suffFullPath) || - frozenModifiedDirs.contains(suffFullPath); + frozenModifiedDirs.contains(suffFullPath) || + (checkTree && isTreeModified(fullPath)); } } + + public void addTreeToModfied(String fullPath) { + String suffFullPath = Tools.concatenatePaths(fullPath, ""); + + synchronized (synchronizer) { + modifiedTrees.add(suffFullPath); + } + } + + public boolean isTreeModified(String fullPath) { + String suffFullPath = Tools.concatenatePaths(fullPath, ""); + + synchronized (synchronizer) { + if (checkPrefixes(modifiedTrees, suffFullPath) || + checkPrefixes(frozenModifiedTrees, suffFullPath)) { + return true; + } + } + + return false; + } } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnServiceImpl.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnServiceImpl.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/svn/service/SvnServiceImpl.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -166,7 +166,15 @@ public boolean isNodeModified(String id, String fullPath) { return repositories.get(id).isNodeModified(fullPath); } + + public void addTreeToModfied(String id, String fullPath) { + repositories.get(id).addTreeToModfied(fullPath); + } + public boolean isTreeModified(String id, String fullPath) { + return repositories.get(id).isTreeModified(fullPath); + } + public void addDirectoryToModfied(String id, String fullPath) { repositories.get(id).addDirectoryToModfied(fullPath); } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/DummyService.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/DummyService.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/DummyService.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -105,4 +105,14 @@ } + public void addTreeToModfied(String id, String fullPath) { + // TODO Auto-generated method stub + + } + + public boolean isTreeModified(String id, String fullPath) { + // TODO Auto-generated method stub + return false; + } + } Modified: trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-svn/src/java/org/jboss/shotoku/test/StandaloneTest.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -426,17 +426,10 @@ cm.save(parent, dir1, dir2, n1, "setup"); - Node original = cm.getNode(TEST_DIR + "/dir1/node1"); - original.copyTo(cm.getDirectory(TEST_DIR + "/dir2"), "node2", "copy-node"); + Directory original = cm.getDirectory(TEST_DIR + "/dir1"); + original.copyTo(cm.getDirectory(TEST_DIR + "/dir2"), "dir3", "copy-dir"); - System.out.println(TEST_CONTENT.equals(original.getContent())); - System.out.println(TEST_CONTENT.equals(cm.getNode(TEST_DIR + "/dir2/node2").getContent())); - /* - // Waiting for a WC update. - Thread.sleep(1000 * 20); - - System.out.println(TEST_CONTENT.equals(cm.getNode(TEST_DIR + "/dir1/node1").getContent())); - System.out.println(TEST_CONTENT.equals(cm.getNode(TEST_DIR + "/dir2/node2").getContent()));*/ + System.out.println(TEST_CONTENT.equals(cm.getNode(TEST_DIR + "/dir2/dir3/node1").getContent())); } finally { try { cm.getDirectory(TEST_DIR).delete(); @@ -446,13 +439,47 @@ } } + private static void checkProperties(Node n) { + Map<String, String> props = n.getProperties(); + + System.out.println(3 == props.size()); + System.out.println("v1".equals(props.get("p1"))); + System.out.println("v2".equals(props.get("p2"))); + System.out.println("v3".equals(props.get("p3"))); + System.out.println(); + } + + public static void propsTest() throws Exception { + try { + Node n0 = cm.getRootDirectory().newNode(TEST_FILE); + n0.save(TEST_FILE); + + Node n = cm.getNode(TEST_FILE); + + n.setProperty("p1", "v1"); + n.setProperty("p2", "v2"); + n.setProperty("p3", "v3"); + n.save("a"); + + checkProperties(n); + + // Waiting for a WC update. + Thread.sleep(1000 * 20); + checkProperties(n); + checkProperties(cm.getNode(TEST_FILE)); + } finally { + cm.getNode(TEST_FILE).delete(); + } + } + public static void main(String[] argv) throws Exception { long now = Calendar.getInstance().getTimeInMillis(); ContentManager.setup(); cm = ContentManager.getContentManager("shotoku-test"); - testCopy(); + propsTest(); + //testCopy(); //multiSaveTest(); //testInject(); //testNested(); Modified: trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/PropertiesTest.java =================================================================== --- trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/PropertiesTest.java 2005-12-09 16:56:45 UTC (rev 1757) +++ trunk/forge/portal-extensions/shotoku/shotoku-test/src/java/org/jboss/shotoku/test/PropertiesTest.java 2005-12-09 17:07:45 UTC (rev 1758) @@ -92,7 +92,7 @@ } private void checkProperties(Node n) { - Map<String, String> props = n.getAllProperties(); + Map<String, String> props = n.getProperties(); assertTrue(3 == props.size()); assertTrue("v1".equals(props.get("p1"))); |
|
From: <jbo...@li...> - 2005-12-09 16:56:51
|
Author: rem...@jb...
Date: 2005-12-09 11:56:45 -0500 (Fri, 09 Dec 2005)
New Revision: 1757
Modified:
trunk/labs/jbossweb/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java
Log:
- Use Error.strnerror.
Modified: trunk/labs/jbossweb/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java 2005-12-09 16:54:41 UTC (rev 1756)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java 2005-12-09 16:56:45 UTC (rev 1757)
@@ -541,12 +541,12 @@
// Bind the server socket
int ret = Socket.bind(serverSock, inetAddress);
if (ret != 0) {
- throw new Exception(sm.getString("endpoint.init.bind", "" + ret));
+ throw new Exception(sm.getString("endpoint.init.bind", Error.strerror(ret)));
}
// Start listening on the server socket
ret = Socket.listen(serverSock, backlog);
if (ret != 0) {
- throw new Exception(sm.getString("endpoint.init.listen", "" + ret));
+ throw new Exception(sm.getString("endpoint.init.listen", Error.strerror(ret)));
}
if (OS.IS_WIN32 || OS.IS_WIN64) {
// On Windows set the reuseaddr flag after the bind/listen
|
|
From: <jbo...@li...> - 2005-12-09 16:54:51
|
Author: rem...@jb...
Date: 2005-12-09 11:54:41 -0500 (Fri, 09 Dec 2005)
New Revision: 1756
Modified:
trunk/labs/jbossweb/src/share/classes/org/apache/tomcat/util/http/Cookies.java
Log:
- Strip quotes when parsing Cookie values, even for v0 Cookies.
Modified: trunk/labs/jbossweb/src/share/classes/org/apache/tomcat/util/http/Cookies.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/tomcat/util/http/Cookies.java 2005-12-09 16:34:08 UTC (rev 1755)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/tomcat/util/http/Cookies.java 2005-12-09 16:54:41 UTC (rev 1756)
@@ -247,9 +247,8 @@
int startValue=skipSpaces( bytes, pos, end);
int endValue=startValue;
- // quote is valid only in version=1 cookies
cc=bytes[pos];
- if( ( version == 1 || isSpecial ) && ( cc== '\'' || cc=='"' ) ) {
+ if( cc== '\'' || cc=='"' ) {
startValue++;
endValue=indexOf( bytes, startValue, end, cc );
pos=endValue+1; // to skip to next cookie
|
|
From: <jbo...@li...> - 2005-12-09 16:34:15
|
Author: rem...@jb...
Date: 2005-12-09 11:34:08 -0500 (Fri, 09 Dec 2005)
New Revision: 1755
Modified:
trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationContextFacade.java
trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationFilterConfig.java
Log:
- Remove useless static loggers.
Modified: trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationContextFacade.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationContextFacade.java 2005-12-09 16:26:35 UTC (rev 1754)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationContextFacade.java 2005-12-09 16:34:08 UTC (rev 1755)
@@ -63,10 +63,6 @@
private HashMap objectCache;
- private static org.apache.commons.logging.Log sysLog=
- org.apache.commons.logging.LogFactory.getLog( ApplicationContextFacade.class );
-
-
// ----------------------------------------------------------- Constructors
@@ -486,22 +482,18 @@
throws Throwable {
Throwable realException;
-
- if (sysLog.isDebugEnabled()) {
- sysLog.debug("ApplicationContextFacade." + methodName, ex);
- }
-
- if (ex instanceof PrivilegedActionException) {
+
+ if (ex instanceof PrivilegedActionException) {
ex = ((PrivilegedActionException) ex).getException();
- }
-
+ }
+
if (ex instanceof InvocationTargetException) {
realException =
- ((InvocationTargetException) ex).getTargetException();
+ ((InvocationTargetException) ex).getTargetException();
} else {
realException = ex;
}
-
+
throw realException;
}
}
Modified: trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationFilterConfig.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationFilterConfig.java 2005-12-09 16:26:35 UTC (rev 1754)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/catalina/core/ApplicationFilterConfig.java 2005-12-09 16:34:08 UTC (rev 1755)
@@ -46,9 +46,7 @@
final class ApplicationFilterConfig implements FilterConfig, Serializable {
- private static org.apache.commons.logging.Log log=
- org.apache.commons.logging.LogFactory.getLog( ApplicationFilterConfig.class );
-
+
// ----------------------------------------------------------- Constructors
@@ -248,12 +246,11 @@
if (this.filter != null){
if( System.getSecurityManager() != null) {
try{
- SecurityUtil.doAsPrivilege("destroy",
- filter);
- SecurityUtil.remove(filter);
+ SecurityUtil.doAsPrivilege("destroy", filter);
} catch(java.lang.Exception ex){
- log.error("ApplicationFilterConfig.doAsPrivilege", ex);
+ context.getLogger().error("ApplicationFilterConfig.doAsPrivilege", ex);
}
+ SecurityUtil.remove(filter);
} else {
filter.destroy();
}
@@ -290,12 +287,11 @@
if (this.filter != null){
if( System.getSecurityManager() != null) {
try{
- SecurityUtil.doAsPrivilege("destroy",
- filter);
- SecurityUtil.remove(filter);
+ SecurityUtil.doAsPrivilege("destroy", filter);
} catch(java.lang.Exception ex){
- log.error("ApplicationFilterConfig.doAsPrivilege", ex);
+ context.getLogger().error("ApplicationFilterConfig.doAsPrivilege", ex);
}
+ SecurityUtil.remove(filter);
} else {
filter.destroy();
}
|
|
From: <jbo...@li...> - 2005-12-09 16:26:53
|
Author: wrzep Date: 2005-12-09 11:26:35 -0500 (Fri, 09 Dec 2005) New Revision: 1754 Added: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/WeightedScorePlugin.java Removed: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/ScoreAlgorithmFactory.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/WeightedScoreAlgorithmFactory.java Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java Log: computing project score is now done in score plugins http://jira.jboss.com/jira/browse/JBLAB-415 Pawel Deleted: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/ScoreAlgorithmFactory.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/ScoreAlgorithmFactory.java 2005-12-09 15:21:18 UTC (rev 1753) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/ScoreAlgorithmFactory.java 2005-12-09 16:26:35 UTC (rev 1754) @@ -1,35 +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; - -import java.util.Collection; - -import org.jboss.forge.status.plugins.Plugin; - -/** -* @author Pawel Wrzeszcz -*/ -public abstract class ScoreAlgorithmFactory { - - public abstract int calculateScore(String projectId, Collection<Plugin> plugins); -} Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-12-09 15:21:18 UTC (rev 1753) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-12-09 16:26:35 UTC (rev 1754) @@ -45,6 +45,7 @@ //import org.jboss.forge.status.plugins.InvalidPluginPropertiesException; import org.jboss.forge.status.plugins.InvalidPluginPropertiesException; import org.jboss.forge.status.plugins.Plugin; +import org.jboss.forge.status.plugins.ScorePlugin; import org.jboss.forge.status.plugins.StatusPlugin; import org.jboss.logging.Logger; @@ -63,18 +64,19 @@ private final static String PLUGIN_PROPERTIES_ELEMENT = "properties"; private String portalName; - private ScoreAlgorithmFactory scoreAlgorithm; private Projects projects; - private List<Plugin> plugins; + private List<Plugin> statusPlugins; + private List<Plugin> scorePlugins; + private List<Plugin> allPlugins; private Logger log; private HashSet<String> pluginsElements; - Status(String portalName, Node statusRoot, Node pluginsRoot, ScoreAlgorithmFactory scoreAlgorithm) { + Status(String portalName, Node statusRoot, Node pluginsRoot) { this.portalName = portalName; - this.scoreAlgorithm = scoreAlgorithm; + log = Logger.getLogger(this.getClass()); initPluginElements(); @@ -82,14 +84,27 @@ // Get the projects projects = ProjectsHelper.getProjects(portalName); - // Get the plugins + // Get the status plugins + Set<Node> statusPluginsNodes = getPluginsNodes(pluginsRoot, STATUS_PLUGIN_ELEMENT); + statusPlugins = getPlugins(statusPluginsNodes); + + // Get the score plugins + Set<Node> scorePluginsNodes = getPluginsNodes(pluginsRoot, SCORE_PLUGIN_ELEMENT); + scorePlugins = getPlugins(scorePluginsNodes); + + allPlugins = new ArrayList<Plugin>(); + allPlugins.addAll(statusPlugins); + allPlugins.addAll(scorePlugins); + } + + private Set<Node> getPluginsNodes(Node pluginsRoot, String pluginElement) { HashSet<String> pluginElementSet = new HashSet<String>(); - pluginElementSet.add(STATUS_PLUGIN_ELEMENT); - pluginElementSet.add(SCORE_PLUGIN_ELEMENT); + pluginElementSet.add(pluginElement); Set<Node> pluginsNodes = getChildNodesSet(pluginsRoot, pluginElementSet); - plugins = getPlugins(pluginsNodes); + + return pluginsNodes; } - + private void initPluginElements() { pluginsElements = new HashSet<String>(); @@ -110,8 +125,8 @@ public void fillContext(DelegateContext context) { // Set collumns names - for (Iterator iter = plugins.iterator(); iter.hasNext();) { - StatusPlugin plugin = (StatusPlugin) iter.next(); + for (Iterator iter = allPlugins.iterator(); iter.hasNext();) { + Plugin plugin = (Plugin) iter.next(); DelegateContext collumnContext = new DelegateContext(); collumnContext.put("name", plugin.getName()); @@ -148,15 +163,12 @@ projectContext.put("name", projects.getProjectName(projectId)); projectContext.put("link", projects.getProjectLink(projectId)); - int projectScore = calculateScore(projectId); - projectContext.put("score", projectScore); - - fillEntries(projectContext, projectId); + fillEntries(projectContext, allPlugins, projectId);; } - private void fillEntries(DelegateContext projectContext, String projectId) { + private void fillEntries(DelegateContext projectContext, List<Plugin> plugins, String projectId) { for (Iterator iter = plugins.iterator(); iter.hasNext();) { - StatusPlugin plugin = (StatusPlugin) iter.next(); + Plugin plugin = (Plugin) iter.next(); DelegateContext entryContext = new DelegateContext(); entryContext.put("value", plugin.getValue(projectId)); @@ -214,8 +226,8 @@ if (pluginType == STATUS_PLUGIN_ELEMENT) { ((StatusPlugin) plugin).init(pluginName, pluginId, projects, pluginSpecificPropertiesMap); - } else { - + } else { /* score plugin */ + ((ScorePlugin) plugin).init(pluginName, pluginId, statusPlugins, pluginSpecificPropertiesMap); } } catch (InvalidPluginPropertiesException e) { @@ -246,10 +258,6 @@ return ret; } - private int calculateScore(String projectId) { - return scoreAlgorithm.calculateScore(projectId, plugins); - } - /** * For the given Node, computes Set of it's child Nodes. * Only child Nodes with names included in <code>nodesNames</code> Set Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2005-12-09 15:21:18 UTC (rev 1753) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2005-12-09 16:26:35 UTC (rev 1754) @@ -55,7 +55,7 @@ if ((root.getNodeType() == Node.ELEMENT_NODE) && (root.getNodeName().equals("projects"))) {}*/ - status = new Status(portalName, statusRoot, pluginsRoot, new WeightedScoreAlgorithmFactory()); + status = new Status(portalName, statusRoot, pluginsRoot); fillContext(); Deleted: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/WeightedScoreAlgorithmFactory.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/WeightedScoreAlgorithmFactory.java 2005-12-09 15:21:18 UTC (rev 1753) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/WeightedScoreAlgorithmFactory.java 2005-12-09 16:26:35 UTC (rev 1754) @@ -1,47 +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; - -import java.util.Collection; -import java.util.Iterator; -import org.jboss.forge.status.plugins.Plugin; - -/** -* @author Pawel Wrzeszcz -*/ -public class WeightedScoreAlgorithmFactory extends ScoreAlgorithmFactory { - - public WeightedScoreAlgorithmFactory() {} - - public int calculateScore(String projectId, Collection<Plugin> plugins) { - int total = 0; - - for (Iterator iter = plugins.iterator(); iter.hasNext();) { - Plugin plugin = (Plugin) iter.next(); - - total += plugin.getValue(projectId); // TODO weights - } - - return total; - } -} Added: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java 2005-12-09 15:21:18 UTC (rev 1753) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/ScorePlugin.java 2005-12-09 16:26:35 UTC (rev 1754) @@ -0,0 +1,40 @@ +/* + * 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.plugins; + +import java.util.Map; +import java.util.List; + +/** +* @author Pawel Wrzeszcz +*/ + +public abstract class ScorePlugin extends Plugin { + + protected List<Plugin> plugins; + + public void init(String name, String id, List<Plugin> plugins, Map<String,String> properties) throws InvalidPluginPropertiesException { + this.plugins = plugins; + init(name, id, properties); + } +} Added: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/WeightedScorePlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/WeightedScorePlugin.java 2005-12-09 15:21:18 UTC (rev 1753) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/WeightedScorePlugin.java 2005-12-09 16:26:35 UTC (rev 1754) @@ -0,0 +1,49 @@ +/* + * 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.plugins; + +import java.util.Iterator; + +/** +* @author Pawel Wrzeszcz +*/ + +public class WeightedScorePlugin extends ScorePlugin { + + public WeightedScorePlugin() { + super(); + } + + public int getValue(String projectId) { + int total = 0; + + for (Iterator iter = plugins.iterator(); iter.hasNext();) { + Plugin plugin = (Plugin) iter.next(); + + total += plugin.getValue(projectId); // TODO weights + } + + return total; + } + +} |
|
From: <jbo...@li...> - 2005-12-09 15:21:44
|
Author: wrzep Date: 2005-12-09 10:21:18 -0500 (Fri, 09 Dec 2005) New Revision: 1753 Added: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/ScoreAlgorithmFactory.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/WeightedScoreAlgorithmFactory.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java Log: superclass for status and score plugin http://jira.jboss.com/jira/browse/JBLAB-415 Pawel Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/ScoreAlgorithmFactory.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/ScoreAlgorithmFactory.java 2005-12-09 15:04:25 UTC (rev 1752) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/ScoreAlgorithmFactory.java 2005-12-09 15:21:18 UTC (rev 1753) @@ -24,12 +24,12 @@ import java.util.Collection; -import org.jboss.forge.status.plugins.StatusPlugin; +import org.jboss.forge.status.plugins.Plugin; /** * @author Pawel Wrzeszcz */ public abstract class ScoreAlgorithmFactory { - public abstract int calculateScore(String projectId, Collection<StatusPlugin> plugins); + public abstract int calculateScore(String projectId, Collection<Plugin> plugins); } Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-12-09 15:04:25 UTC (rev 1752) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-12-09 15:21:18 UTC (rev 1753) @@ -44,6 +44,7 @@ //import org.jboss.forge.status.plugins.InvalidPluginPropertiesException; import org.jboss.forge.status.plugins.InvalidPluginPropertiesException; +import org.jboss.forge.status.plugins.Plugin; import org.jboss.forge.status.plugins.StatusPlugin; import org.jboss.logging.Logger; @@ -65,7 +66,7 @@ private ScoreAlgorithmFactory scoreAlgorithm; private Projects projects; - private List<StatusPlugin> plugins; + private List<Plugin> plugins; private Logger log; @@ -164,13 +165,13 @@ } } - private List<StatusPlugin> getPlugins(Set<Node> pluginsNodes) { - ArrayList<StatusPlugin> plugins = new ArrayList<StatusPlugin>(); + private List<Plugin> getPlugins(Set<Node> pluginsNodes) { + ArrayList<Plugin> plugins = new ArrayList<Plugin>(); for (Iterator iter = pluginsNodes.iterator(); iter.hasNext();) { Node pluginNode = (Node) iter.next(); - StatusPlugin plugin = getPlugin(pluginNode); + Plugin plugin = getPlugin(pluginNode); if (plugin != null) { plugins.add(plugin); @@ -180,7 +181,7 @@ return plugins; } - private StatusPlugin getPlugin(Node pluginNode) { + private Plugin getPlugin(Node pluginNode) { // Get plugin info from pluginNode String pluginType = pluginNode.getNodeName(); @@ -207,24 +208,26 @@ } // Get plugin instance; + Plugin plugin = null; try { + plugin = (Plugin) pluginClass.newInstance(); if (pluginType == STATUS_PLUGIN_ELEMENT) { - StatusPlugin plugin = (StatusPlugin) pluginClass.newInstance(); - plugin.init(pluginName, pluginId, projects, pluginSpecificPropertiesMap); - return plugin; + ((StatusPlugin) plugin).init(pluginName, pluginId, projects, pluginSpecificPropertiesMap); } else { } } catch (InvalidPluginPropertiesException e) { log.warn(e); + return null; } catch (Exception e) { log.error("Plugin class: " + pluginClassString + ". Instantination failed.", e); + return null; } - return null; + return plugin; } Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/WeightedScoreAlgorithmFactory.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/WeightedScoreAlgorithmFactory.java 2005-12-09 15:04:25 UTC (rev 1752) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/WeightedScoreAlgorithmFactory.java 2005-12-09 15:21:18 UTC (rev 1753) @@ -24,7 +24,7 @@ import java.util.Collection; import java.util.Iterator; -import org.jboss.forge.status.plugins.StatusPlugin; +import org.jboss.forge.status.plugins.Plugin; /** * @author Pawel Wrzeszcz @@ -33,11 +33,11 @@ public WeightedScoreAlgorithmFactory() {} - public int calculateScore(String projectId, Collection<StatusPlugin> plugins) { + public int calculateScore(String projectId, Collection<Plugin> plugins) { int total = 0; for (Iterator iter = plugins.iterator(); iter.hasNext();) { - StatusPlugin plugin = (StatusPlugin) iter.next(); + Plugin plugin = (Plugin) iter.next(); total += plugin.getValue(projectId); // TODO weights } Added: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java 2005-12-09 15:04:25 UTC (rev 1752) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Plugin.java 2005-12-09 15:21:18 UTC (rev 1753) @@ -0,0 +1,48 @@ +/* + * 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.plugins; + +import java.util.Map; + +/** +* @author Pawel Wrzeszcz +*/ + +public abstract class Plugin { + + protected Map properties; + + protected String name; + protected String id; + + public void init(String name, String id, Map<String,String> properties) throws InvalidPluginPropertiesException { + this.properties = properties; + this.name = name; + this.id = id; + } + + public abstract int getValue(String projectId); + + public String getId() { return id; }; + public String getName() { return name; }; +} Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java 2005-12-09 15:04:25 UTC (rev 1752) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/StatusPlugin.java 2005-12-09 15:21:18 UTC (rev 1753) @@ -30,23 +30,12 @@ * @author Pawel Wrzeszcz */ -public abstract class StatusPlugin { +public abstract class StatusPlugin extends Plugin { protected Projects projects; - protected Map properties; - protected String name; - protected String id; - public void init(String name, String id, Projects projects, Map<String,String> properties) throws InvalidPluginPropertiesException { this.projects = projects; - this.properties = properties; - this.name = name; - this.id = id; + init(name, id, properties); } - - public abstract int getValue(String projectId); - - public String getId() { return id; }; - public String getName() { return name; }; } |
|
From: <jbo...@li...> - 2005-12-09 15:04:31
|
Author: wrzep Date: 2005-12-09 10:04:25 -0500 (Fri, 09 Dec 2005) New Revision: 1752 Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java Log: introduced 2 plugins versions - status plugin and score plugin http://jira.jboss.com/jira/browse/JBLAB-415 Pawel Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-12-09 12:52:15 UTC (rev 1751) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-12-09 15:04:25 UTC (rev 1752) @@ -52,7 +52,8 @@ */ public class Status extends AbstractDescriptor { - private final static String PLUGIN_ELEMENT = "plugin"; + private final static String STATUS_PLUGIN_ELEMENT = "status-plugin"; + private final static String SCORE_PLUGIN_ELEMENT = "score-plugin"; private final static String PLUGIN_ID_ELEMENT = "id"; private final static String PLUGIN_NAME_ELEMENT = "name"; @@ -82,7 +83,8 @@ // Get the plugins HashSet<String> pluginElementSet = new HashSet<String>(); - pluginElementSet.add(PLUGIN_ELEMENT); + pluginElementSet.add(STATUS_PLUGIN_ELEMENT); + pluginElementSet.add(SCORE_PLUGIN_ELEMENT); Set<Node> pluginsNodes = getChildNodesSet(pluginsRoot, pluginElementSet); plugins = getPlugins(pluginsNodes); } @@ -179,9 +181,11 @@ } private StatusPlugin getPlugin(Node pluginNode) { - Map<String,Node> pluginProperties = getChildNodesMap(pluginNode, pluginsElements); // Get plugin info from pluginNode + String pluginType = pluginNode.getNodeName(); + + Map<String,Node> pluginProperties = getChildNodesMap(pluginNode, pluginsElements); String pluginClassString = XmlTools.unmarshallText(pluginProperties.get(PLUGIN_CLASS_ELEMENT)); String pluginName = XmlTools.unmarshallText(pluginProperties.get(PLUGIN_NAME_ELEMENT)); String pluginId = XmlTools.unmarshallText(pluginProperties.get(PLUGIN_ID_ELEMENT)); @@ -194,16 +198,7 @@ log.error("Plugin class not found: " + pluginClassString); return null; } - - // Get plugin instance - StatusPlugin plugin = null; - try { - plugin = (StatusPlugin) pluginClass.newInstance(); - } catch (Exception e) { - log.error("Plugin class: " + pluginClassString + ". Instantination failed.", e); - return null; - } - + // Get plugin properies node Map<String,String> pluginSpecificPropertiesMap = null; Node pluginSpecificPropertiesNode = pluginProperties.get(PLUGIN_PROPERTIES_ELEMENT); @@ -211,15 +206,25 @@ pluginSpecificPropertiesMap = getChildNodesStringMap(pluginSpecificPropertiesNode); } - // Initialize plugin + // Get plugin instance; try { - plugin.init(pluginName, pluginId, projects, pluginSpecificPropertiesMap); + + if (pluginType == STATUS_PLUGIN_ELEMENT) { + StatusPlugin plugin = (StatusPlugin) pluginClass.newInstance(); + plugin.init(pluginName, pluginId, projects, pluginSpecificPropertiesMap); + return plugin; + } else { + + } + } catch (InvalidPluginPropertiesException e) { log.warn(e); - return null; + } + catch (Exception e) { + log.error("Plugin class: " + pluginClassString + ". Instantination failed.", e); } - return plugin; + return null; } |
550 messages has been excluded from this view by a project administrator.
