Permalink
Browse files

Updating the whole code to the current 5.12 version with EJB 3

  • Loading branch information...
1 parent 256e4aa commit e6497a92d2527f07b265da6a25a22fba18fedcd8 @ehsavoie ehsavoie committed Apr 22, 2013
Showing with 14,557 additions and 13,141 deletions.
  1. +17 −0 .gitignore
  2. +15 −42 pom.xml
  3. +26 −0 src/main/assemblies/assembly-taglib.xml
  4. +41 −23 src/main/java/com/silverpeas/tags/AllPublicationsTEI.java
  5. +120 −118 src/main/java/com/silverpeas/tags/AllPublicationsTag.java
  6. +158 −135 src/main/java/com/silverpeas/tags/BeanUtil.java
  7. +97 −80 src/main/java/com/silverpeas/tags/ComponentTagUtil.java
  8. +179 −171 src/main/java/com/silverpeas/tags/DisplayPropertyTag.java
  9. +70 −49 src/main/java/com/silverpeas/tags/DisplayPropertyTagExtraInfo.java
  10. +44 −23 src/main/java/com/silverpeas/tags/HelloWorldTag.java
  11. +39 −20 src/main/java/com/silverpeas/tags/HomeTEI.java
  12. +0 −41 src/main/java/com/silverpeas/tags/HomeTag.java
  13. +41 −23 src/main/java/com/silverpeas/tags/IterateTEI.java
  14. +88 −76 src/main/java/com/silverpeas/tags/IterateTag.java
  15. +66 −45 src/main/java/com/silverpeas/tags/MethodKey.java
  16. +144 −142 src/main/java/com/silverpeas/tags/PublicationContentTag.java
  17. +62 −40 src/main/java/com/silverpeas/tags/PublicationContentTagExtraInfo.java
  18. +215 −219 src/main/java/com/silverpeas/tags/PublicationTag.java
  19. +70 −49 src/main/java/com/silverpeas/tags/PublicationTagExtraInfo.java
  20. +111 −97 src/main/java/com/silverpeas/tags/almanach/AlmanachTag.java
  21. +72 −58 src/main/java/com/silverpeas/tags/almanach/AlmanachTagUtil.java
  22. +76 −52 src/main/java/com/silverpeas/tags/authentication/AuthenticateTag.java
  23. +79 −67 src/main/java/com/silverpeas/tags/authentication/AuthenticateTagUtil.java
  24. +47 −38 src/main/java/com/silverpeas/tags/authentication/AuthenticationManager.java
  25. +36 −21 src/main/java/com/silverpeas/tags/authentication/BasicAuthentication.java
  26. +41 −54 src/main/java/com/silverpeas/tags/authentication/CTIAuthentication.java
  27. +61 −39 src/main/java/com/silverpeas/tags/authentication/IsLogin.java
  28. +61 −39 src/main/java/com/silverpeas/tags/authentication/IsNotLogin.java
  29. +38 −25 src/main/java/com/silverpeas/tags/authentication/SQLAuthentication.java
  30. +28 −9 src/main/java/com/silverpeas/tags/authentication/UserAuthentication.java
  31. +124 −124 src/main/java/com/silverpeas/tags/comment/CommentTag.java
  32. +70 −46 src/main/java/com/silverpeas/tags/comment/CommentTagUtil.java
  33. +122 −124 src/main/java/com/silverpeas/tags/forum/ForumTag.java
  34. +99 −83 src/main/java/com/silverpeas/tags/forum/ForumTagUtil.java
  35. +124 −124 src/main/java/com/silverpeas/tags/gallery/GalleryTag.java
  36. +243 −219 src/main/java/com/silverpeas/tags/gallery/GalleryTagUtil.java
  37. +347 −355 src/main/java/com/silverpeas/tags/highlight/HighlightTag.java
  38. +50 −31 src/main/java/com/silverpeas/tags/highlight/TermComparator.java
  39. +86 −68 src/main/java/com/silverpeas/tags/homepage/CategoriesTitleTag.java
  40. +280 −266 src/main/java/com/silverpeas/tags/homepage/CategoriesTreeTag.java
  41. +102 −72 src/main/java/com/silverpeas/tags/homepage/CollaborativeSpaceTitleTag.java
  42. +275 −234 src/main/java/com/silverpeas/tags/homepage/CollaborativeSpaceTreeTag.java
  43. +69 −41 src/main/java/com/silverpeas/tags/homepage/DomainsBarFooterTag.java
  44. +72 −44 src/main/java/com/silverpeas/tags/homepage/DomainsBarHeadingTag.java
  45. +96 −72 src/main/java/com/silverpeas/tags/homepage/DomainsBarLayerTag.java
  46. +130 −95 src/main/java/com/silverpeas/tags/homepage/MapPersonnalSpaceTag.java
  47. +101 −68 src/main/java/com/silverpeas/tags/homepage/PersonnalSpaceChoiceTag.java
  48. +72 −48 src/main/java/com/silverpeas/tags/homepage/SearchEngineTag.java
  49. +164 −148 src/main/java/com/silverpeas/tags/homepage/SpaceChoiceTag.java
  50. +116 −62 src/main/java/com/silverpeas/tags/homepage/TopBarIconsTag.java
  51. +1,217 −1,333 src/main/java/com/silverpeas/tags/kmelia/KmeliaTagUtil.java
  52. +41 −23 src/main/java/com/silverpeas/tags/kmelia/getKmeliaTEI.java
  53. +118 −104 src/main/java/com/silverpeas/tags/kmelia/getKmeliaTag.java
  54. +283 −252 src/main/java/com/silverpeas/tags/navigation/FilArianeTag.java
  55. +103 −73 src/main/java/com/silverpeas/tags/navigation/KmeliaCaching.java
  56. +92 −68 src/main/java/com/silverpeas/tags/navigation/LabelTag.java
  57. +183 −153 src/main/java/com/silverpeas/tags/navigation/LienTag.java
  58. +489 −442 src/main/java/com/silverpeas/tags/navigation/MenuTag.java
  59. +226 −196 src/main/java/com/silverpeas/tags/navigation/PageListeTag.java
  60. +71 −43 src/main/java/com/silverpeas/tags/navigation/PublicationCache.java
  61. +103 −68 src/main/java/com/silverpeas/tags/navigation/config/AutoRefreshingProperties.java
  62. +63 −40 src/main/java/com/silverpeas/tags/navigation/config/Configurateur.java
  63. +28 −4 src/main/java/com/silverpeas/tags/navigation/config/FileChangeAdapter.java
  64. +31 −7 src/main/java/com/silverpeas/tags/navigation/config/FileChangeListener.java
  65. +117 −86 src/main/java/com/silverpeas/tags/navigation/filters/BrowserFilter.java
  66. +132 −103 src/main/java/com/silverpeas/tags/navigation/links/CachedLinkGeneratorImpl.java
  67. +27 −1 src/main/java/com/silverpeas/tags/navigation/links/LinkGenerator.java
  68. +45 −21 src/main/java/com/silverpeas/tags/navigation/links/LinkGeneratorFactory.java
  69. +109 −83 src/main/java/com/silverpeas/tags/navigation/links/LinkGeneratorImpl.java
  70. +63 −40 src/main/java/com/silverpeas/tags/navigation/utils/AsciiUtils.java
  71. +35 −11 src/main/java/com/silverpeas/tags/navigation/utils/NodeDetailComparator.java
  72. +133 −137 src/main/java/com/silverpeas/tags/notation/NotationTag.java
  73. +107 −110 src/main/java/com/silverpeas/tags/notation/NotationTagUtil.java
  74. +137 −134 src/main/java/com/silverpeas/tags/organization/MenuItem.java
  75. +456 −511 src/main/java/com/silverpeas/tags/organization/OrganizationTagUtil.java
  76. +41 −23 src/main/java/com/silverpeas/tags/organization/getOrganizationTEI.java
  77. +97 −82 src/main/java/com/silverpeas/tags/organization/getOrganizationTag.java
  78. +41 −23 src/main/java/com/silverpeas/tags/organization/getPathTEI.java
  79. +110 −102 src/main/java/com/silverpeas/tags/organization/getPathTag.java
  80. +57 −39 src/main/java/com/silverpeas/tags/pdc/GSCCreationDateComparatorAsc.java
  81. +56 −37 src/main/java/com/silverpeas/tags/pdc/GSCCreationDateComparatorDesc.java
  82. +57 −39 src/main/java/com/silverpeas/tags/pdc/GSCDateComparatorAsc.java
  83. +56 −37 src/main/java/com/silverpeas/tags/pdc/GSCDateComparatorDesc.java
  84. +47 −28 src/main/java/com/silverpeas/tags/pdc/GSCNameComparatorAsc.java
  85. +51 −33 src/main/java/com/silverpeas/tags/pdc/GSCNameComparatorDesc.java
  86. +1,250 −1,297 src/main/java/com/silverpeas/tags/pdc/PdcTagUtil.java
  87. +41 −23 src/main/java/com/silverpeas/tags/pdc/getPdcViewTEI.java
  88. +130 −120 src/main/java/com/silverpeas/tags/pdc/getPdcViewTag.java
  89. +145 −144 src/main/java/com/silverpeas/tags/publication/PublicationTagUtil.java
  90. +105 −92 src/main/java/com/silverpeas/tags/quickinfo/QuickInfoTag.java
  91. +285 −259 src/main/java/com/silverpeas/tags/quickinfo/QuickInfoTagUtil.java
  92. +563 −521 src/main/java/com/silverpeas/tags/searchEngine/SearchEngineTagUtil.java
  93. +41 −23 src/main/java/com/silverpeas/tags/searchEngine/getSearchEngineTEI.java
  94. +199 −196 src/main/java/com/silverpeas/tags/searchEngine/getSearchEngineTag.java
  95. +59 −37 src/main/java/com/silverpeas/tags/servlets/OnlineFile.java
  96. +265 −302 src/main/java/com/silverpeas/tags/servlets/WebFileServer.java
  97. +122 −123 src/main/java/com/silverpeas/tags/tagcloud/TagCloudTag.java
  98. +200 −201 src/main/java/com/silverpeas/tags/tagcloud/TagCloudTagUtil.java
  99. +82 −76 src/main/java/com/silverpeas/tags/util/Admin.java
  100. +43 −22 src/main/java/com/silverpeas/tags/util/AuthorizationException.java
  101. +0 −92 src/main/java/com/silverpeas/tags/util/EJBDynaProxy.java
  102. +77 −59 src/main/java/com/silverpeas/tags/util/LoopTag.java
  103. +107 −92 src/main/java/com/silverpeas/tags/util/SiteTag.java
  104. +163 −163 src/main/java/com/silverpeas/tags/util/SiteTagUtil.java
  105. +43 −22 src/main/java/com/silverpeas/tags/util/VisibilityException.java
  106. +375 −363 src/main/java/com/stratelia/webactiv/homepage/HomePageFunctions.java
  107. +181 −206 src/main/java/com/stratelia/webactiv/homepage/HomePageUtil.java
  108. +125 −103 src/main/java/com/stratelia/webactiv/homepage/JspHelper.java
  109. +26 −0 src/main/resources/WEB-INF/web.xml
  110. +24 −0 src/test/java/com/silverpeas/tags/kmelia/KmeliaTagUtilTest.java
View
@@ -0,0 +1,17 @@
+/target/
+.idea
+*.iws
+*.ipr
+*.iml
+*.merge*
+catalog.xml
+target
+.settings
+.classpath
+.project
+.idea
+.sonar-ide.properties
+nbactions.xml
+nb-configuration.xml
+nbactions.xml
+
View
57 pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.silverpeas</groupId>
<artifactId>parent</artifactId>
- <version>24</version>
+ <version>25-SNAPSHOT</version>
</parent>
<groupId>com.silverpeas</groupId>
@@ -16,25 +16,11 @@
<url>http://www.silverpeas.com</url>
- <distributionManagement>
- <repository>
- <id>silverpeas</id>
- <name>Repository Silverpeas</name>
- <layout>default</layout>
- <url>http://www.silverpeas.org/nexus/content/repositories/sp-non-free/</url>
- </repository>
- <snapshotRepository>
- <id>silverpeas-snapshots</id>
- <name>Snapshots Repository Silverpeas</name>
- <layout>default</layout>
- <url>http://www.silverpeas.org/nexus/content/repositories/sp-dev-non-free/</url>
- </snapshotRepository>
- </distributionManagement>
-
<scm>
- <connection>scm:svn:https://www.silverpeas.org/svn/websites/professional-edition/taglibs/tags/taglibs-5.12</connection>
- <developerConnection>scm:svn:https://www.silverpeas.org/svn/websites/professional-edition/taglibs/tags/taglibs-5.12</developerConnection>
- <url>https://www.silverpeas.org/svn/websites/professional-edition/taglibs/tags/taglibs-5.12</url>
+ <connection>scm:git:git@github.com:Silverpeas/taglibs.git</connection>
+ <developerConnection>scm:git:git@github.com:Silverpeas/taglibs.git</developerConnection>
+ <url>http://github.com/Silverpeas/taglibs</url>
+ <tag>HEAD</tag>
</scm>
<repositories>
@@ -60,26 +46,24 @@
<dependencies>
<dependency>
- <groupId>javax.ejb</groupId>
- <artifactId>ejb-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
</dependency>
<dependency>
<groupId>taglibs</groupId>
@@ -101,35 +85,30 @@
<dependency>
<groupId>com.silverpeas.core.ejb-core</groupId>
<artifactId>admin</artifactId>
- <classifier>client</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.silverpeas.core.ejb-core</groupId>
<artifactId>authentication</artifactId>
- <classifier>client</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.silverpeas.core.ejb-core</groupId>
<artifactId>pdc</artifactId>
- <classifier>client</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.silverpeas.core.ejb-core</groupId>
<artifactId>node</artifactId>
- <classifier>client</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.silverpeas.core.ejb-core</groupId>
<artifactId>publication</artifactId>
- <classifier>client</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -142,14 +121,12 @@
<dependency>
<groupId>com.silverpeas.core.ejb-core</groupId>
<artifactId>tagcloud</artifactId>
- <classifier>client</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.silverpeas.core.ejb-core</groupId>
<artifactId>notation</artifactId>
- <classifier>client</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
@@ -162,34 +139,30 @@
<dependency>
<groupId>com.silverpeas.components.almanach</groupId>
<artifactId>almanach-ejb</artifactId>
- <classifier>client</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.silverpeas.components.kmelia</groupId>
<artifactId>kmelia-ejb</artifactId>
- <classifier>client</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.silverpeas.components.forums</groupId>
<artifactId>forums-ejb</artifactId>
- <classifier>client</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.silverpeas.components.gallery</groupId>
<artifactId>gallery-ejb</artifactId>
- <classifier>client</classifier>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
+ <artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -1,4 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (C) 2000 - 2012 Silverpeas
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ As a special exception to the terms and conditions of version 3.0 of
+ the GPL, you may redistribute this Program in connection with Free/Libre
+ Open Source Software ("FLOSS") applications as described in Silverpeas's
+ FLOSS exception. You should have received a copy of the text describing
+ the FLOSS exception, and it is also available here:
+ "http://www.silverpeas.org/legal/licensing"
+
+ This program 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 Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+-->
+
<assembly>
<id>installation</id>
<formats>
@@ -1,24 +1,42 @@
-package com.silverpeas.tags;
-
-import javax.servlet.jsp.tagext.*;
-
-public class AllPublicationsTEI extends TagExtraInfo {
-
- public AllPublicationsTEI()
- {
- super();
- }
-
- public VariableInfo[] getVariableInfo(TagData data)
- {
- return new VariableInfo[]
- {
- new VariableInfo(
- "publication",
- "com.stratelia.webactiv.util.publication.model.PublicationDetail",
- true,
- VariableInfo.NESTED
- ),
- };
- }
+/**
+ * Copyright (C) 2000 - 2012 Silverpeas
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * As a special exception to the terms and conditions of version 3.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * Open Source Software ("FLOSS") applications as described in Silverpeas's
+ * FLOSS exception. You should have received a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * "http://www.silverpeas.org/legal/licensing"
+ *
+ * This program 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.silverpeas.tags;
+
+import javax.servlet.jsp.tagext.*;
+
+public class AllPublicationsTEI extends TagExtraInfo {
+
+ public AllPublicationsTEI() {
+ super();
+ }
+
+ public VariableInfo[] getVariableInfo(TagData data) {
+ return new VariableInfo[] { new VariableInfo(
+ "publication",
+ "com.stratelia.webactiv.util.publication.model.PublicationDetail",
+ true,
+ VariableInfo.NESTED), };
+ }
}
Oops, something went wrong.

0 comments on commit e6497a9

Please sign in to comment.