Skip to content

Commit e6497a9

Browse files
author
Emmanuel Hugonnet
committed
Updating the whole code to the current 5.12 version with EJB 3
1 parent 256e4aa commit e6497a9

File tree

110 files changed

+14557
-13141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+14557
-13141
lines changed

‎.gitignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/target/
2+
.idea
3+
*.iws
4+
*.ipr
5+
*.iml
6+
*.merge*
7+
catalog.xml
8+
target
9+
.settings
10+
.classpath
11+
.project
12+
.idea
13+
.sonar-ide.properties
14+
nbactions.xml
15+
nb-configuration.xml
16+
nbactions.xml
17+

‎pom.xml

Lines changed: 15 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.silverpeas</groupId>
77
<artifactId>parent</artifactId>
8-
<version>24</version>
8+
<version>25-SNAPSHOT</version>
99
</parent>
1010

1111
<groupId>com.silverpeas</groupId>
@@ -16,25 +16,11 @@
1616
<url>http://www.silverpeas.com</url>
1717

1818

19-
<distributionManagement>
20-
<repository>
21-
<id>silverpeas</id>
22-
<name>Repository Silverpeas</name>
23-
<layout>default</layout>
24-
<url>http://www.silverpeas.org/nexus/content/repositories/sp-non-free/</url>
25-
</repository>
26-
<snapshotRepository>
27-
<id>silverpeas-snapshots</id>
28-
<name>Snapshots Repository Silverpeas</name>
29-
<layout>default</layout>
30-
<url>http://www.silverpeas.org/nexus/content/repositories/sp-dev-non-free/</url>
31-
</snapshotRepository>
32-
</distributionManagement>
33-
3419
<scm>
35-
<connection>scm:svn:https://www.silverpeas.org/svn/websites/professional-edition/taglibs/tags/taglibs-5.12</connection>
36-
<developerConnection>scm:svn:https://www.silverpeas.org/svn/websites/professional-edition/taglibs/tags/taglibs-5.12</developerConnection>
37-
<url>https://www.silverpeas.org/svn/websites/professional-edition/taglibs/tags/taglibs-5.12</url>
20+
<connection>scm:git:git@github.com:Silverpeas/taglibs.git</connection>
21+
<developerConnection>scm:git:git@github.com:Silverpeas/taglibs.git</developerConnection>
22+
<url>http://github.com/Silverpeas/taglibs</url>
23+
<tag>HEAD</tag>
3824
</scm>
3925

4026
<repositories>
@@ -59,16 +45,6 @@
5945

6046

6147
<dependencies>
62-
<dependency>
63-
<groupId>javax.ejb</groupId>
64-
<artifactId>ejb-api</artifactId>
65-
<scope>provided</scope>
66-
</dependency>
67-
<dependency>
68-
<groupId>javax.servlet.jsp</groupId>
69-
<artifactId>jsp-api</artifactId>
70-
<scope>provided</scope>
71-
</dependency>
7248
<dependency>
7349
<groupId>org.springframework</groupId>
7450
<artifactId>spring-context</artifactId>
@@ -77,9 +53,17 @@
7753
<groupId>javax.servlet</groupId>
7854
<artifactId>jstl</artifactId>
7955
</dependency>
56+
<dependency>
57+
<groupId>javax.servlet.jsp</groupId>
58+
<artifactId>jsp-api</artifactId>
59+
</dependency>
8060
<dependency>
8161
<groupId>javax.servlet</groupId>
82-
<artifactId>servlet-api</artifactId>
62+
<artifactId>javax.servlet-api</artifactId>
63+
</dependency>
64+
<dependency>
65+
<groupId>javax.ejb</groupId>
66+
<artifactId>ejb-api</artifactId>
8367
</dependency>
8468
<dependency>
8569
<groupId>taglibs</groupId>
@@ -101,35 +85,30 @@
10185
<dependency>
10286
<groupId>com.silverpeas.core.ejb-core</groupId>
10387
<artifactId>admin</artifactId>
104-
<classifier>client</classifier>
10588
<version>${project.version}</version>
10689
<scope>provided</scope>
10790
</dependency>
10891
<dependency>
10992
<groupId>com.silverpeas.core.ejb-core</groupId>
11093
<artifactId>authentication</artifactId>
111-
<classifier>client</classifier>
11294
<version>${project.version}</version>
11395
<scope>provided</scope>
11496
</dependency>
11597
<dependency>
11698
<groupId>com.silverpeas.core.ejb-core</groupId>
11799
<artifactId>pdc</artifactId>
118-
<classifier>client</classifier>
119100
<version>${project.version}</version>
120101
<scope>provided</scope>
121102
</dependency>
122103
<dependency>
123104
<groupId>com.silverpeas.core.ejb-core</groupId>
124105
<artifactId>node</artifactId>
125-
<classifier>client</classifier>
126106
<version>${project.version}</version>
127107
<scope>provided</scope>
128108
</dependency>
129109
<dependency>
130110
<groupId>com.silverpeas.core.ejb-core</groupId>
131111
<artifactId>publication</artifactId>
132-
<classifier>client</classifier>
133112
<version>${project.version}</version>
134113
<scope>provided</scope>
135114
</dependency>
@@ -142,14 +121,12 @@
142121
<dependency>
143122
<groupId>com.silverpeas.core.ejb-core</groupId>
144123
<artifactId>tagcloud</artifactId>
145-
<classifier>client</classifier>
146124
<version>${project.version}</version>
147125
<scope>provided</scope>
148126
</dependency>
149127
<dependency>
150128
<groupId>com.silverpeas.core.ejb-core</groupId>
151129
<artifactId>notation</artifactId>
152-
<classifier>client</classifier>
153130
<version>${project.version}</version>
154131
<scope>provided</scope>
155132
</dependency>
@@ -162,34 +139,30 @@
162139
<dependency>
163140
<groupId>com.silverpeas.components.almanach</groupId>
164141
<artifactId>almanach-ejb</artifactId>
165-
<classifier>client</classifier>
166142
<version>${project.version}</version>
167143
<scope>provided</scope>
168144
</dependency>
169145
<dependency>
170146
<groupId>com.silverpeas.components.kmelia</groupId>
171147
<artifactId>kmelia-ejb</artifactId>
172-
<classifier>client</classifier>
173148
<version>${project.version}</version>
174149
<scope>provided</scope>
175150
</dependency>
176151
<dependency>
177152
<groupId>com.silverpeas.components.forums</groupId>
178153
<artifactId>forums-ejb</artifactId>
179-
<classifier>client</classifier>
180154
<version>${project.version}</version>
181155
<scope>provided</scope>
182156
</dependency>
183157
<dependency>
184158
<groupId>com.silverpeas.components.gallery</groupId>
185159
<artifactId>gallery-ejb</artifactId>
186-
<classifier>client</classifier>
187160
<version>${project.version}</version>
188161
<scope>provided</scope>
189162
</dependency>
190163
<dependency>
191164
<groupId>junit</groupId>
192-
<artifactId>junit-dep</artifactId>
165+
<artifactId>junit</artifactId>
193166
<scope>test</scope>
194167
</dependency>
195168
<dependency>

‎src/main/assemblies/assembly-taglib.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (C) 2000 - 2012 Silverpeas
5+
6+
This program is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU Affero General Public License as
8+
published by the Free Software Foundation, either version 3 of the
9+
License, or (at your option) any later version.
10+
11+
As a special exception to the terms and conditions of version 3.0 of
12+
the GPL, you may redistribute this Program in connection with Free/Libre
13+
Open Source Software ("FLOSS") applications as described in Silverpeas's
14+
FLOSS exception. You should have received a copy of the text describing
15+
the FLOSS exception, and it is also available here:
16+
"http://www.silverpeas.org/legal/licensing"
17+
18+
This program is distributed in the hope that it will be useful,
19+
but WITHOUT ANY WARRANTY; without even the implied warranty of
20+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+
GNU Affero General Public License for more details.
22+
23+
You should have received a copy of the GNU Affero General Public License
24+
along with this program. If not, see <http://www.gnu.org/licenses/>.
25+
26+
-->
27+
228
<assembly>
329
<id>installation</id>
430
<formats>

‎src/main/java/com/silverpeas/tags/AllPublicationsTEI.java

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,42 @@
1-
package com.silverpeas.tags;
2-
3-
import javax.servlet.jsp.tagext.*;
4-
5-
public class AllPublicationsTEI extends TagExtraInfo {
6-
7-
public AllPublicationsTEI()
8-
{
9-
super();
10-
}
11-
12-
public VariableInfo[] getVariableInfo(TagData data)
13-
{
14-
return new VariableInfo[]
15-
{
16-
new VariableInfo(
17-
"publication",
18-
"com.stratelia.webactiv.util.publication.model.PublicationDetail",
19-
true,
20-
VariableInfo.NESTED
21-
),
22-
};
23-
}
1+
/**
2+
* Copyright (C) 2000 - 2012 Silverpeas
3+
*
4+
* This program is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU Affero General Public License as
6+
* published by the Free Software Foundation, either version 3 of the
7+
* License, or (at your option) any later version.
8+
*
9+
* As a special exception to the terms and conditions of version 3.0 of
10+
* the GPL, you may redistribute this Program in connection with Free/Libre
11+
* Open Source Software ("FLOSS") applications as described in Silverpeas's
12+
* FLOSS exception. You should have received a copy of the text describing
13+
* the FLOSS exception, and it is also available here:
14+
* "http://www.silverpeas.org/legal/licensing"
15+
*
16+
* This program is distributed in the hope that it will be useful,
17+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
* GNU Affero General Public License for more details.
20+
*
21+
* You should have received a copy of the GNU Affero General Public License
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
23+
*/
24+
25+
package com.silverpeas.tags;
26+
27+
import javax.servlet.jsp.tagext.*;
28+
29+
public class AllPublicationsTEI extends TagExtraInfo {
30+
31+
public AllPublicationsTEI() {
32+
super();
33+
}
34+
35+
public VariableInfo[] getVariableInfo(TagData data) {
36+
return new VariableInfo[] { new VariableInfo(
37+
"publication",
38+
"com.stratelia.webactiv.util.publication.model.PublicationDetail",
39+
true,
40+
VariableInfo.NESTED), };
41+
}
2442
}

0 commit comments

Comments
 (0)