LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added minor documentation, fixed and synced netbeans integration. In sync with fedorahosted r2846 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2932 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2014-10-31 02:07:26 +00:00
parent c57973f825
commit 63725fbf56
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ccm-core/src/com/arsdigita/web/Web.java
View File

@ -104,6 +104,7 @@ public class Web {
* Gets the web context object from the current thread. * Gets the web context object from the current thread.
* *
* @return A <code>WebContext</code> object; it cannot be null * @return A <code>WebContext</code> object; it cannot be null
* Note: Rename from getContext()
*/ */
public static WebContext getWebContext() { public static WebContext getWebContext() {
if (s_context == null) { if (s_context == null) {
@ -486,6 +487,10 @@ public class Web {
*/ */
// private static final Map s_contexts = new HashMap(); // private static final Map s_contexts = new HashMap();
/**
* @deprecated renamed to getWebContext
*/
// getContext()
/** /**
* Gets the servlet context matching the provided URI. The URI * Gets the servlet context matching the provided URI. The URI

23
tools-ng/netbeans/project.xml
View File

@ -259,12 +259,6 @@
<location>ccm-cms-types-simpleaddress/src</location> <location>ccm-cms-types-simpleaddress/src</location>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</source-folder> </source-folder>
<source-folder>
<label>ccm-cms-types-simpleorganization (Source)</label>
<type>java</type>
<location>ccm-cms-types-simpleorganization/src</location>
<encoding>UTF-8</encoding>
</source-folder>
<source-folder> <source-folder>
<label>ccm-cms-types-siteproxy (Source)</label> <label>ccm-cms-types-siteproxy (Source)</label>
<type>java</type> <type>java</type>
@ -511,6 +505,12 @@
<location>ccm-ldn-types-esdservice/src</location> <location>ccm-ldn-types-esdservice/src</location>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</source-folder> </source-folder>
<source-folder>
<label>ccm-ldn-types-organization (Source)</label>
<type>java</type>
<location>ccm-ldn-types-organization/src</location>
<encoding>UTF-8</encoding>
</source-folder>
<source-folder> <source-folder>
<label>ccm-ldn-userpreferences (Source)</label> <label>ccm-ldn-userpreferences (Source)</label>
<type>java</type> <type>java</type>
@ -866,10 +866,6 @@
<label>ccm-cms-types-simpleaddress (Source)</label> <label>ccm-cms-types-simpleaddress (Source)</label>
<location>ccm-cms-types-simpleaddress/src</location> <location>ccm-cms-types-simpleaddress/src</location>
</source-folder> </source-folder>
<source-folder style="packages">
<label>ccm-cms-types-simpleorganization (Source)</label>
<location>ccm-cms-types-simpleorganization/src</location>
</source-folder>
<source-folder style="packages"> <source-folder style="packages">
<label>ccm-cms-types-siteproxy (Source)</label> <label>ccm-cms-types-siteproxy (Source)</label>
<location>ccm-cms-types-siteproxy/src</location> <location>ccm-cms-types-siteproxy/src</location>
@ -1038,6 +1034,10 @@
<label>ccm-ldn-types-esdservice (Source)</label> <label>ccm-ldn-types-esdservice (Source)</label>
<location>ccm-ldn-types-esdservice/src</location> <location>ccm-ldn-types-esdservice/src</location>
</source-folder> </source-folder>
<source-folder style="packages">
<label>ccm-ldn-types-organization (Source)</label>
<location>ccm-ldn-types-organization/src</location>
</source-folder>
<source-folder style="packages"> <source-folder style="packages">
<label>ccm-ldn-userpreferences (Source)</label> <label>ccm-ldn-userpreferences (Source)</label>
<location>ccm-ldn-userpreferences/src</location> <location>ccm-ldn-userpreferences/src</location>
@ -1178,6 +1178,7 @@
<package-root>ccm-cms-types-contact/src</package-root> <package-root>ccm-cms-types-contact/src</package-root>
<package-root>ccm-cms-types-decisiontree/src</package-root> <package-root>ccm-cms-types-decisiontree/src</package-root>
<package-root>ccm-cms-types-esdservice/src</package-root> <package-root>ccm-cms-types-esdservice/src</package-root>
<package-root>ccm-cms-types-organization/src</package-root>
<package-root>ccm-cms-types-event/src</package-root> <package-root>ccm-cms-types-event/src</package-root>
<package-root>ccm-cms-types-faqitem/src</package-root> <package-root>ccm-cms-types-faqitem/src</package-root>
<package-root>ccm-cms-types-filestorageitem/src</package-root> <package-root>ccm-cms-types-filestorageitem/src</package-root>
@ -1201,7 +1202,6 @@
<package-root>ccm-cms-types-researchnetwork/src</package-root> <package-root>ccm-cms-types-researchnetwork/src</package-root>
<package-root>ccm-cms-types-service/src</package-root> <package-root>ccm-cms-types-service/src</package-root>
<package-root>ccm-cms-types-simpleaddress/src</package-root> <package-root>ccm-cms-types-simpleaddress/src</package-root>
<package-root>ccm-cms-types-simpleorganisation/src</package-root>
<package-root>ccm-cms-types-siteproxy/src</package-root> <package-root>ccm-cms-types-siteproxy/src</package-root>
<package-root>ccm-cms-types-survey/src</package-root> <package-root>ccm-cms-types-survey/src</package-root>
<package-root>ccm-cms-types-xmlfeed/src</package-root> <package-root>ccm-cms-types-xmlfeed/src</package-root>
@ -1244,6 +1244,7 @@
<package-root>ccm-ldn-types-contact/src</package-root> <package-root>ccm-ldn-types-contact/src</package-root>
<package-root>ccm-ldn-types-councillor/src</package-root> <package-root>ccm-ldn-types-councillor/src</package-root>
<package-root>ccm-ldn-types-esdservice/src</package-root> <package-root>ccm-ldn-types-esdservice/src</package-root>
<package-root>ccm-ldn-types-organization/src</package-root>
<package-root>ccm-ldn-userpreferences/src</package-root> <package-root>ccm-ldn-userpreferences/src</package-root>
<package-root>ccm-ldn-util/src</package-root> <package-root>ccm-ldn-util/src</package-root>
<package-root>ccm-lbc-aplaws/src</package-root> <package-root>ccm-lbc-aplaws/src</package-root>