From 8c40c81c519170a040237a3a2a032760ba67441c Mon Sep 17 00:00:00 2001 From: pb Date: Sun, 12 Nov 2017 19:32:14 +0000 Subject: [PATCH] Updated tools-ng Netbeans project.xml & various minor adjustments. git-svn-id: https://svn.libreccm.org/ccm/trunk@5116 8810af33-2d31-482b-a856-94f89814c4df --- .../bundles/standard/cfg/project.xml | 4 +- .../themedirector/ThemeDirectorConfig.java | 20 --- .../themedirector/util/ThemeFileUtil.java | 4 +- tools-ng/netbeans/project.xml | 146 ++++++++++++------ 4 files changed, 99 insertions(+), 75 deletions(-) diff --git a/ccm-lcs-bundle/bundles/standard/cfg/project.xml b/ccm-lcs-bundle/bundles/standard/cfg/project.xml index 6729e5471..358ae5bed 100644 --- a/ccm-lcs-bundle/bundles/standard/cfg/project.xml +++ b/ccm-lcs-bundle/bundles/standard/cfg/project.xml @@ -14,8 +14,8 @@ ccmVersion="6.1" name="librecms-std" prettyName="LibreCMS (Standard Bundle)" - version="2.3.0" - release="devel-SNAPSHOT-r2915" + version="2.3.99" + release="trunk-r5116" webxml="libre-web.xml" webapp="ROOT" xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd"> diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java index 2ac9e627a..2f94f3db5 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/ThemeDirectorConfig.java @@ -197,26 +197,6 @@ public class ThemeDirectorConfig extends AbstractConfig { return defaultThemePath; } -// /** -// * This returns the name of the servlet context containing -// * the default theme. -// * -// * @return -// * @deprecated without direct replacement, See note above -// */ -// public String getDefaultThemeContext() { -// String ctx = (String)get(m_defaultThemeContext); -// if (ctx == null) { -// ctx = "/"; -// } -// if (!ctx.endsWith("/")) { -// ctx = ctx + "/"; -// } -// if (!ctx.startsWith("/")) { -// ctx = "/" + ctx; -// } -// return ctx; -// } /** * This returns the name of the manifest file containing a list of default * theme. diff --git a/ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeFileUtil.java b/ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeFileUtil.java index 155176727..c2713aeb0 100755 --- a/ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeFileUtil.java +++ b/ccm-themedirector/src/com/arsdigita/themedirector/util/ThemeFileUtil.java @@ -11,7 +11,7 @@ * implied. See the License for the specific language governing * rights and limitations under the License. * - */ +*/ package com.arsdigita.themedirector.util; import com.arsdigita.themedirector.Theme; @@ -51,7 +51,7 @@ import java.util.List; */ public class ThemeFileUtil { - private static Logger s_log = Logger.getLogger(ThemeFileUtil.class); + private static final Logger s_log = Logger.getLogger(ThemeFileUtil.class); /** * this copies the files from the file system to the database. diff --git a/tools-ng/netbeans/project.xml b/tools-ng/netbeans/project.xml index 34755b251..d8817ba41 100644 --- a/tools-ng/netbeans/project.xml +++ b/tools-ng/netbeans/project.xml @@ -73,18 +73,6 @@ ccm-cms-assets-relatedlink/src UTF-8 - - - java - ccm-cms-personalcontentcomponent/src - UTF-8 - - - - java - ccm-cms-publicpersonalprofile/src - UTF-8 - java @@ -313,6 +301,18 @@ ccm-calendar/src UTF-8 + + + java + ccm-cms-publicpersonalprofile/src + UTF-8 + + + + java + ccm-cms-personalcontentcomponent/src + UTF-8 + java @@ -577,6 +577,12 @@ ccm-lbc-wordxml/src UTF-8 + + + java + ccm-sci-bundle/src + UTF-8 + java @@ -602,9 +608,9 @@ UTF-8 - + java - ccm-sci-bundle/src + ccm-sci-member-navigation/src UTF-8 @@ -619,12 +625,42 @@ ccm-sci-personalpublications/src UTF-8 + + + java + ccm-sci-project-navigation/src + UTF-8 + java ccm-sci-publications/src UTF-8 + + + java + ccm-sci-publications-dramaticarts/src + UTF-8 + + + + java + ccm-sci-publications-navigation/src + UTF-8 + + + + java + ccm-sci-publications-researchreport/src + UTF-8 + + + + java + ccm-sci-publications-talk/src + UTF-8 + java @@ -637,24 +673,12 @@ ccm-sci-publicationscvsimporter/src UTF-8 - - - java - ccm-sci-publications-dramaticarts/src - UTF-8 - java ccm-sci-publicationsexportlinks/src UTF-8 - - - java - ccm-sci-publications-researchreport/src - UTF-8 - java @@ -754,14 +778,6 @@ ccm-cms-assets-relatedlink/src - - - ccm-cms-personalcontentcomponent/src - - - - ccm-cms-publicpersonalprofile/src - ccm-cms-types-address/src @@ -914,6 +930,14 @@ ccm-calendar/src + + + ccm-cms-publicpersonalprofile/src + + + + ccm-cms-personalcontentcomponent/src + ccm-docmgr/src @@ -1090,6 +1114,10 @@ ccm-lbc-wordxml/src + + + ccm-sci-bundle/src + ccm-sci-assets-publicationsabout/src @@ -1107,8 +1135,8 @@ ccm-sci-assets-publicationspublicationtype/src - - ccm-sci-bundle/src + + ccm-sci-member-navigation/src @@ -1118,10 +1146,30 @@ ccm-sci-personalpublications/src + + + ccm-sci-project-navigation/src + ccm-sci-publications/src + + + ccm-sci-publications-dramaticarts/src + + + + ccm-sci-publications-navigation/src + + + + ccm-sci-publications-researchreport/src + + + + ccm-sci-publications-talk/src + ccm-sci-cvsexporter/src @@ -1130,18 +1178,10 @@ ccm-sci-publicationscvsimporter/src - - - ccm-sci-publications-dramaticarts/src - ccm-sci-publicationsexportlinks/src - - - ccm-sci-publications-researchreport/src - ccm-sci-types-department/src @@ -1185,8 +1225,6 @@ ccm-cms-assets-notes/src ccm-cms-assets-orgaunittext/src ccm-cms-assets-relatedlink/src - ccm-cms-personalcontentcomponent/src - ccm-cms-publicpersonalprofile/src ccm-cms-types-address/src ccm-cms-types-agenda/src ccm-cms-types-article/src @@ -1227,6 +1265,8 @@ ccm-auth-http/src ccm-bookmarks/src ccm-calendar/src + ccm-cms-publicpersonalprofile/src + ccm-cms-personalcontentcomponent/src ccm-docmgr/src ccm-docrepo/src ccm-faq/src @@ -1271,25 +1311,29 @@ ccm-lbc-foi/src ccm-lbc-retention/src ccm-lbc-wordxml/src + ccm-sci-bundle/src ccm-sci-assets-publicationsabout/src ccm-sci-assets-publicationslibrarysignatures/src ccm-sci-assets-publicationspersons/src ccm-sci-assets-publicationspublicationtype/src - ccm-sci-bundle/src + ccm-sci-member-navigation/src ccm-sci-personalprojects/src ccm-sci-personalpublications/src + ccm-sci-project-navigation/src ccm-sci-publications/src + ccm-sci-publications-dramaticarts/src + ccm-sci-publications-navigation/src + ccm-sci-publications-researchreport/src + ccm-sci-publications-talk/src ccm-sci-publicationscsvexporter/src ccm-sci-publicationscsvimporter/src - ccm-sci-publications-dramaticarts/src ccm-sci-publicationsexportlinks/src - ccm-sci-publications-researchreport/src ccm-sci-types-department/src ccm-sci-types-institute/src ccm-sci-types-member/src ccm-sci-types-project/src - ccm-core/lib/log4j.jar:ccm-core/lib/mail.jar:ccm-core/lib/jsoup.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-io-1.3.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/imgscalr-lib-4.3-SNAPSHOT.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:ccm-sci-publications/lib/jbibtex-1.0.2.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/servlet-api.jar:tools-ng/devel/lib/jsp-api.jar:tools-ng/devel/lib/portlet-2.0.jar - 1.6 + ccm-core/lib/log4j-1.2-api-2.8.2.jar:ccm-core/lib/log4j-api-2.8.2.jar: ccm-core/lib/log4j-core-2.8.2.jar:ccm-core/lib/mail.jar:ccm-core/lib/jsoup.jar:ccm-core/lib/commons-beanutils.jar:ccm-core/lib/commons-cli-1.0.jar:ccm-core/lib/commons-collections-3.0.jar:ccm-core/lib/commons-codec-1.3.jar:ccm-core/lib/commons-fileupload-1.1.1.jar:ccm-core/lib/commons-io-1.3.1.jar:ccm-core/lib/commons-lang-2.1.jar:ccm-core/lib/commons-primitives-1.0.jar:ccm-core/lib/xercesImpl.jar:ccm-core/lib/jakarta-oro-2.0.8.jar:ccm-core/lib/Tidy.jar:ccm-core/lib/imgscalr-lib-4.3-SNAPSHOT.jar:ccm-core/lib/jdom.jar:ccm-core/lib/jdxslt.jar:ccm-core/lib/lucene-core-2.4.0.jar:ccm-core/lib/saxon9h2.jar:ccm-core/lib/poi-2.5-final-20040302.jar:ccm-core/lib/pdfbox-1.4.0.jar:ccm-core/lib/tm-extractors-0.4.jar:ccm-core/lib/bcprov-jdk16-144.jar:ccm-cms/lib/jai_codec.jar:ccm-cms/lib/jai_core.jar:ccm-cms/lib/mlibwrapper_jai.jar:ccm-ldn-search/lib/axis.jar:ccm-ldn-search/lib/jaxrpc.jar:ccm-ldn-search/lib/jobo.jar:ccm-ldn-terms/lib/commons-digester.jar:ccm-ldn-terms/lib/jena.jar:ccm-ldn-terms/lib/snowball.jar:ccm-ldn-terms/lib/weka-3.5.5.jar:ccm-ldn-terms/lib/xstream-1.3.1.jar:ccm-formbuilder-pdf/lib/fop.jar:ccm-sci-publications/lib/jbibtex-1.0.2.jar:ccm-themedirector/lib/jlessc-1.5.jar:tools-ng/devel/lib/ojdbc14.jar:tools-ng/devel/lib/servlet-api.jar:tools-ng/devel/lib/jsp-api.jar:tools-ng/devel/lib/portlet-2.0.jar + 1.7