Skip to content
This repository was archived by the owner on Oct 28, 2022. It is now read-only.

Commit e509bef

Browse files
jcagarciajcagarcia
committed
Refactoring annotations project to include addon annotations .jar
1 parent 274b6a0 commit e509bef

File tree

5 files changed

+132
-59
lines changed

5 files changed

+132
-59
lines changed

‎addon-web-mvc-controller/addon/src/main/resources/org/springframework/roo/addon/web/mvc/controller/addon/converter/ApplicationConversionServiceFactoryBean-template._java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package __PACKAGE__;
22

33
import org.springframework.format.FormatterRegistry;
44
import org.springframework.format.support.FormattingConversionServiceFactoryBean;
5-
import org.springframework.roo.addon.web.mvc.controller.converter.RooConversionService;
5+
import org.springframework.roo.addon.web.mvc.controller.annotations.converter.RooConversionService;
66

77
/**
88
* A central place to register application converters and formatters.

‎annotations/README.md

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
== Annotations Project
2+
3+
This project includes all Spring Roo Annotations dependencies to be included on Spring Roo generated project as:
4+
5+
<dependency>
6+
<groupId>org.springframework.roo</groupId>
7+
<artifactId>org.springframework.roo.annotations</artifactId>
8+
<version>${roo.version}</version>
9+
<scope>provided</scope>
10+
</dependency>

‎annotations/pom.xml

+61-50
Original file line numberDiff line numberDiff line change
@@ -8,58 +8,69 @@
88
<relativePath>../runtime/osgi-bundle</relativePath>
99
</parent>
1010
<artifactId>org.springframework.roo.annotations</artifactId>
11-
<packaging>bundle</packaging>
11+
<packaging>pom</packaging>
1212
<name>Spring Roo - Annotations (ASLv2 Licensed)</name>
1313

1414
<dependencies>
15-
<!-- Apache Felix -->
16-
<dependency>
17-
<groupId>org.apache.felix</groupId>
18-
<artifactId>org.apache.felix.scr.annotations</artifactId>
19-
</dependency>
15+
<!-- Roo Configurable Annotations -->
16+
<dependency>
17+
<groupId>org.springframework.roo</groupId>
18+
<artifactId>org.springframework.roo.addon.configurable.annotations</artifactId>
19+
</dependency>
20+
<!-- Roo Dbre Annotations -->
21+
<dependency>
22+
<groupId>org.springframework.roo</groupId>
23+
<artifactId>org.springframework.roo.addon.dbre.annotations</artifactId>
24+
</dependency>
25+
<!-- Roo Dod Annotations -->
26+
<dependency>
27+
<groupId>org.springframework.roo</groupId>
28+
<artifactId>org.springframework.roo.addon.dod.annotations</artifactId>
29+
</dependency>
30+
<!--Roo JavaBean Annotations -->
31+
<dependency>
32+
<groupId>org.springframework.roo</groupId>
33+
<artifactId>org.springframework.roo.addon.javabean.annotations</artifactId>
34+
</dependency>
35+
<!-- Roo JPA Annotations -->
36+
<dependency>
37+
<groupId>org.springframework.roo</groupId>
38+
<artifactId>org.springframework.roo.addon.jpa.annotations</artifactId>
39+
</dependency>
40+
<!-- Roo JSON Annotations -->
41+
<dependency>
42+
<groupId>org.springframework.roo</groupId>
43+
<artifactId>org.springframework.roo.addon.json.annotations</artifactId>
44+
</dependency>
45+
<!-- Roo Layers Repository JPA Annotations -->
46+
<dependency>
47+
<groupId>org.springframework.roo</groupId>
48+
<artifactId>org.springframework.roo.addon.layers.repository.jpa.annotations</artifactId>
49+
</dependency>
50+
<!-- Roo Layers Service Annotations -->
51+
<dependency>
52+
<groupId>org.springframework.roo</groupId>
53+
<artifactId>org.springframework.roo.addon.layers.service.annotations</artifactId>
54+
</dependency>
55+
<!-- Roo Plural Annotations -->
56+
<dependency>
57+
<groupId>org.springframework.roo</groupId>
58+
<artifactId>org.springframework.roo.addon.plural.annotations</artifactId>
59+
</dependency>
60+
<!-- Roo Security Annotations -->
61+
<dependency>
62+
<groupId>org.springframework.roo</groupId>
63+
<artifactId>org.springframework.roo.addon.security.annotations</artifactId>
64+
</dependency>
65+
<!-- Roo Test Annotations -->
66+
<dependency>
67+
<groupId>org.springframework.roo</groupId>
68+
<artifactId>org.springframework.roo.addon.test.annotations</artifactId>
69+
</dependency>
70+
<!-- Roo Web MVC Controller Annotations -->
71+
<dependency>
72+
<groupId>org.springframework.roo</groupId>
73+
<artifactId>org.springframework.roo.addon.web.mvc.controller.annotations</artifactId>
74+
</dependency>
2075
</dependencies>
21-
22-
<build>
23-
<plugins>
24-
<plugin> <!-- Should move antrun to a pluginManagement section in root POM; similarly do this for all other plugins -->
25-
<artifactId>maven-antrun-plugin</artifactId>
26-
<version>1.7</version>
27-
<executions>
28-
<execution>
29-
<id>generate-sources</id>
30-
<phase>generate-sources</phase>
31-
<configuration>
32-
<target>
33-
<delete dir="${basedir}/src/main/java/org/" />
34-
<copy todir="${basedir}/src/main/java/" preservelastmodified="true">
35-
<fileset dir="${basedir}/..">
36-
<include name="**/Roo*.java" />
37-
<exclude name="core/**" />
38-
<exclude name="**/RooJavaType.java" />
39-
</fileset>
40-
<!-- Discard the module names prefixes from each file path -->
41-
<regexpmapper from="^(.*).src.main.java.(.*)$$" to="\2" />
42-
</copy>
43-
</target>
44-
</configuration>
45-
<goals>
46-
<goal>run</goal>
47-
</goals>
48-
</execution>
49-
</executions>
50-
<dependencies>
51-
<dependency>
52-
<groupId>ant-contrib</groupId>
53-
<artifactId>ant-contrib</artifactId>
54-
<version>20020829</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.apache.ant</groupId>
58-
<artifactId>ant-apache-regexp</artifactId>
59-
<version>1.7.1</version>
60-
</dependency>
61-
</dependencies>
62-
</plugin>
63-
</plugins>
64-
</build>
6576
</project>

‎annotations/src/main/java/readme.txt

-8
This file was deleted.

‎pom.xml

+60
Original file line numberDiff line numberDiff line change
@@ -522,31 +522,61 @@
522522
<artifactId>org.springframework.roo.addon.plural.addon</artifactId>
523523
<version>${project.version}</version>
524524
</dependency>
525+
<dependency>
526+
<groupId>org.springframework.roo</groupId>
527+
<artifactId>org.springframework.roo.addon.plural.annotations</artifactId>
528+
<version>${project.version}</version>
529+
</dependency>
525530
<dependency>
526531
<groupId>org.springframework.roo</groupId>
527532
<artifactId>org.springframework.roo.addon.configurable.addon</artifactId>
528533
<version>${project.version}</version>
529534
</dependency>
535+
<dependency>
536+
<groupId>org.springframework.roo</groupId>
537+
<artifactId>org.springframework.roo.addon.configurable.annotations</artifactId>
538+
<version>${project.version}</version>
539+
</dependency>
530540
<dependency>
531541
<groupId>org.springframework.roo</groupId>
532542
<artifactId>org.springframework.roo.addon.dod.addon</artifactId>
533543
<version>${project.version}</version>
534544
</dependency>
545+
<dependency>
546+
<groupId>org.springframework.roo</groupId>
547+
<artifactId>org.springframework.roo.addon.dod.annotations</artifactId>
548+
<version>${project.version}</version>
549+
</dependency>
535550
<dependency>
536551
<groupId>org.springframework.roo</groupId>
537552
<artifactId>org.springframework.roo.addon.test.addon</artifactId>
538553
<version>${project.version}</version>
539554
</dependency>
555+
<dependency>
556+
<groupId>org.springframework.roo</groupId>
557+
<artifactId>org.springframework.roo.addon.test.annotations</artifactId>
558+
<version>${project.version}</version>
559+
</dependency>
540560
<dependency>
541561
<groupId>org.springframework.roo</groupId>
542562
<artifactId>org.springframework.roo.addon.javabean.addon</artifactId>
543563
<version>${project.version}</version>
544564
</dependency>
565+
<dependency>
566+
<groupId>org.springframework.roo</groupId>
567+
<artifactId>org.springframework.roo.addon.javabean.annotations</artifactId>
568+
<version>${project.version}</version>
569+
</dependency>
545570
<dependency>
546571
<groupId>org.springframework.roo</groupId>
547572
<artifactId>org.springframework.roo.addon.jpa.addon</artifactId>
548573
<version>${project.version}</version>
549574
</dependency>
575+
<dependency>
576+
<groupId>org.springframework.roo</groupId>
577+
<artifactId>org.springframework.roo.addon.jpa.annotations</artifactId>
578+
<version>${project.version}</version>
579+
</dependency>
550580
<dependency>
551581
<groupId>org.springframework.roo</groupId>
552582
<artifactId>org.springframework.roo.addon.finder</artifactId>
@@ -557,11 +587,21 @@
557587
<artifactId>org.springframework.roo.addon.json.addon</artifactId>
558588
<version>${project.version}</version>
559589
</dependency>
590+
<dependency>
591+
<groupId>org.springframework.roo</groupId>
592+
<artifactId>org.springframework.roo.addon.json.annotations</artifactId>
593+
<version>${project.version}</version>
594+
</dependency>
560595
<dependency>
561596
<groupId>org.springframework.roo</groupId>
562597
<artifactId>org.springframework.roo.addon.web.mvc.controller.addon</artifactId>
563598
<version>${project.version}</version>
564599
</dependency>
600+
<dependency>
601+
<groupId>org.springframework.roo</groupId>
602+
<artifactId>org.springframework.roo.addon.web.mvc.controller.annotations</artifactId>
603+
<version>${project.version}</version>
604+
</dependency>
565605
<dependency>
566606
<groupId>org.springframework.roo</groupId>
567607
<artifactId>org.springframework.roo.addon.backup</artifactId>
@@ -577,6 +617,11 @@
577617
<artifactId>org.springframework.roo.addon.security.addon</artifactId>
578618
<version>${project.version}</version>
579619
</dependency>
620+
<dependency>
621+
<groupId>org.springframework.roo</groupId>
622+
<artifactId>org.springframework.roo.addon.security.annotations</artifactId>
623+
<version>${project.version}</version>
624+
</dependency>
580625
<dependency>
581626
<groupId>org.springframework.roo</groupId>
582627
<artifactId>org.springframework.roo.addon.jdbc</artifactId>
@@ -586,12 +631,27 @@
586631
<groupId>org.springframework.roo</groupId>
587632
<artifactId>org.springframework.roo.addon.layers.repository.jpa.addon</artifactId>
588633
<version>${project.version}</version>
634+
</dependency>
635+
<dependency>
636+
<groupId>org.springframework.roo</groupId>
637+
<artifactId>org.springframework.roo.addon.layers.repository.jpa.annotations</artifactId>
638+
<version>${project.version}</version>
589639
</dependency>
590640
<dependency>
591641
<groupId>org.springframework.roo</groupId>
592642
<artifactId>org.springframework.roo.addon.layers.service.addon</artifactId>
593643
<version>${project.version}</version>
594644
</dependency>
645+
<dependency>
646+
<groupId>org.springframework.roo</groupId>
647+
<artifactId>org.springframework.roo.addon.layers.service.annotations</artifactId>
648+
<version>${project.version}</version>
649+
</dependency>
650+
<dependency>
651+
<groupId>org.springframework.roo</groupId>
652+
<artifactId>org.springframework.roo.addon.dbre.annotations</artifactId>
653+
<version>${project.version}</version>
654+
</dependency>
595655
<!-- End Roo Addons -->
596656
<dependency>
597657
<groupId>org.springframework.roo</groupId>

0 commit comments

Comments
 (0)