Skip to content

Commit 4596c62

Browse files
strubergstruberg
committed
DELTASPIKE-1478 fix svnpub URL and docs
1 parent 8b82f7f commit 4596c62

File tree

6 files changed

+13
-44
lines changed

6 files changed

+13
-44
lines changed

‎deltaspike/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<url>http://deltaspike.apache.org</url>
6565

6666
<properties>
67-
<svn.scmPubUrl>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/javadoc/${project.version}</svn.scmPubUrl>
67+
<svn.scmPubUrl>https://svn.apache.org/repos/infra/sites/deltaspike/javadoc/${project.version}</svn.scmPubUrl>
6868
</properties>
6969

7070
<modules>

‎documentation/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
<url>http://deltaspike.apache.org/documentation</url>
3939

4040
<properties>
41-
<svn.scmPubUrl>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/documentation/</svn.scmPubUrl>
42-
<svn.scmPubUrlStaging>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/staging/documentation/</svn.scmPubUrlStaging>
41+
<svn.scmPubUrl>https://svn.apache.org/repos/infra/sites/deltaspike/documentation/</svn.scmPubUrl>
4342
</properties>
4443

4544
<build>

‎documentation/src/main/asciidoc/overview.adoc‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,17 @@ the most from this technology.
2323

2424
*Transactional support for non-EJB beans:* The Transactional Interceptor in DeltaSpike paved the way for
2525
`@Transactional` in Java EE 7.
26-
27-
*Injectable Servlet objects:* Enables CDI injection in Servlets in Java EE 6/CDI 1.0 environments
26+
Although we not only support JTA transactions but also resource local transactions and use a slightly different Exception handling.
2827

2928
*Injectable resources:* Configuration, resource bundles,... are easy to inject when using CDI and Apache DeltaSpike.
3029

3130
*@Exclude annotation:* Lets you prevent classes from being treated as CDI beans even if they are in a CDI-enabled
32-
archive in a Java EE 6/CDI 1.0 environment where `@Vetoed` is unavailable or when you need to veto based on
33-
ProjectStages or expressions.
34-
35-
*Scheduling tasks*: Async processes in a non-EE7 environment.
31+
archive in a Jakarta EE project.
32+
You can even exclude classes based on ProjectStages or configuration expressions.
3633

37-
*Bean Validation integration:* Injection of CDI beans and EJBs into Constraint Validators.
34+
*Scheduling tasks*: handle Async processes in a non-JakartaEE environment.
3835

39-
*BeanProvider:* Access the BeanManager and CDI beans even in non-managed classes like JPA 2.0 EntityListeners or
36+
*BeanProvider:* Easy Access to the BeanManager and CDI beans even in non-managed classes like JPA 2.0 EntityListeners or
4037
Spring Beans.
4138

4239

@@ -50,8 +47,6 @@ provides a more solid navigation in case of JSF and helps a lot in the maintenan
5047
*View-Controller:* Based on type-safe view-configs, view-controller annotations provide a type-safe alternative to
5148
standard tags.
5249

53-
*Injection in Converters and Validators:* Inject CDI beans and EJBs into JSF Converters and Validators.
54-
5550
*JSF event broadcasting to CDI:* Allows CDI to be notified about JSF events
5651

5752
=== Productivity Improvements
@@ -64,8 +59,6 @@ standard tags.
6459

6560
*Data Module:* An out of the box entity framework solution complete with support for container or application managed persistence contexts, as well as JDBC.
6661

67-
*Decoupled Exception handling:* Event-based exception handling framework, similar to the CDI event observer mechanism.
68-
6962
*JMX integration:* Any CDI bean can be exposed via JMX easily with a single annotation.
7063

7164
*Type-safe i18n messages:* Localized messages are easy to use with an interface and a resource bundle, no more boilerplate and your messages now have context within the code.
@@ -77,7 +70,8 @@ approach which can be used in CDI-based applications.
7770

7871
=== CDI
7972
Java Contexts and Dependency Injection for the Java EE platform (link:https://jcp.org/en/jsr/detail?id=299[JSR 299]),
80-
abbreviated _CDI_ was introduced as part of Java EE 6. The core features of CDI are as follows:
73+
abbreviated _CDI_ was introduced as part of Java EE 6 and is now part of Jakarta Enterprise.
74+
The core features of CDI are as follows:
8175

8276
* improved stateful object lifecycles with an additional context named _Conversation_ that encompasses a series of requests within one session and lifecycle management by the container according to well-defined contexts
8377
* dependency injection conducted in a type-safe manner, with type checking conducted at compilation time so errors are exposed earlier and debugging is easier

‎pom.xml‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<url>http://deltaspike.apache.org</url>
4949

5050
<properties>
51-
<asciidoctor.version>1.5.2</asciidoctor.version>
51+
<asciidoctor.version>1.5.8</asciidoctor.version>
5252
<version.deltaspike.latest.stable>2.0.0</version.deltaspike.latest.stable>
5353
<version.deltaspike.latest.snapshot>2.0.1-SNAPSHOT</version.deltaspike.latest.snapshot>
5454
<svn.scmPubCheckoutDirectory>${project.build.directory}/co-site</svn.scmPubCheckoutDirectory>
@@ -141,26 +141,4 @@
141141
</plugins>
142142
</build>
143143

144-
<profiles>
145-
<profile>
146-
<!-- Profile used to publish documentation and site under staging
147-
folder. -->
148-
<id>staging</id>
149-
<build>
150-
<pluginManagement>
151-
<plugins>
152-
<plugin>
153-
<groupId>org.apache.maven.plugins</groupId>
154-
<artifactId>maven-scm-publish-plugin</artifactId>
155-
<version>1.1</version>
156-
<configuration>
157-
<pubScmUrl>scm:svn:${svn.scmPubUrlStaging}</pubScmUrl>
158-
</configuration>
159-
</plugin>
160-
</plugins>
161-
</pluginManagement>
162-
</build>
163-
</profile>
164-
</profiles>
165-
166144
</project>

‎site/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
<url>http://deltaspike.apache.org</url>
3939

4040
<properties>
41-
<svn.scmPubUrl>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/</svn.scmPubUrl>
42-
<svn.scmPubUrlStaging>https://svn.apache.org/repos/asf/deltaspike/site/trunk/content/staging/</svn.scmPubUrlStaging>
41+
<svn.scmPubUrl>https://svn.apache.org/repos/infra/sites/deltaspike/</svn.scmPubUrl>
4342
</properties>
4443

4544
<build>

‎site/src/main/asciidoc/index.adoc‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ useful features for Java application developers.
1010
We will also ensure true portability! We are testing DeltaSpike on
1111
different CDI implementations like Apache OpenWebBeans and JBoss Weld,
1212
and also on different Java EE servers like Apache Tomcat and TomEE,
13-
JBoss AS7, WildFly 8.x and 9.x, Oracle GlassFish 3.1+ and 4.x+, IBM
14-
WebSphere 8.x, Oracle WebLogic Server 12c, Jetty, and others.
13+
JBoss Enterprise, WildFly, GlassFish, Liberty, Oracle WebLogic and others.
1514

1615
link:documentation/overview.html[View details »]
1716
|===
@@ -36,7 +35,7 @@ link:/documentation/modules.html[View details »]
3635
[options="header,footer"]
3736
|===
3837
|*News* | *Examples*
39-
| Apache DeltaSpike 1.9.3 is now out!
38+
| Apache DeltaSpike 2.0.0 supporting JakartaEE is now out!
4039

4140
link:/news.html[View details »]
4241

0 commit comments

Comments
 (0)