Skip to content

Commit 5669bb3

Browse files
arun-guptaarun-gupta
committed
Merge pull request javaee-samples#315 from rhanus/master
fixed project's naming conventions
2 parents a05d7eb + 6b84efd commit 5669bb3

File tree

15 files changed

+99
-378
lines changed

15 files changed

+99
-378
lines changed

‎cdi/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ The [JSR 346](https://jcp.org/en/jsr/detail?id=346) updates and clarifications t
2424
- nobeans-el-injection
2525
- nobeans-el-injection-flowscoped
2626
- events
27+
- events-conditional-reception
28+
- instance
29+
- instance-qualifiers
2730

2831
## How to run
2932

‎cdi/beanmanager/pom.xml

+11-16
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
46

5-
<parent>
6-
<groupId>org.javaee7</groupId>
7-
<artifactId>cdi</artifactId>
8-
<version>1.0-SNAPSHOT</version>
9-
<relativePath>../pom.xml</relativePath>
10-
</parent>
11-
<groupId>org.javaee7</groupId>
12-
<artifactId>cdi-beanmanager</artifactId>
13-
<version>1.0-SNAPSHOT</version>
14-
<packaging>war</packaging>
15-
<name>Java EE 7 Sample: cdi - beanmanager</name>
7+
<parent>
8+
<groupId>org.javaee7</groupId>
9+
<artifactId>cdi</artifactId>
10+
<version>1.0-SNAPSHOT</version>
11+
</parent>
12+
<artifactId>cdi-beanmanager</artifactId>
13+
<name>Java EE 7 Sample: cdi - beanmanager</name>
1614

17-
<properties>
18-
<netbeans.hint.deploy.server>gfv3ee6</netbeans.hint.deploy.server>
19-
</properties>
2015
</project>

‎cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/Greeting.java renamed to ‎cdi/beanmanager/src/main/java/org/javaee7/cdi/beanmanager/Greeting.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javaee7.cdisamples.beanmanager;
1+
package org.javaee7.cdi.beanmanager;
22

33
/**
44
* @author Arun Gupta

‎cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SimpleGreeting.java renamed to ‎cdi/beanmanager/src/main/java/org/javaee7/cdi/beanmanager/SimpleGreeting.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javaee7.cdisamples.beanmanager;
1+
package org.javaee7.cdi.beanmanager;
22

33
/**
44
* @author Arun Gupta

‎cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/SmileyGreeting.java renamed to ‎cdi/beanmanager/src/main/java/org/javaee7/cdi/beanmanager/SmileyGreeting.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javaee7.cdisamples.beanmanager;
1+
package org.javaee7.cdi.beanmanager;
22

33
/**
44
* @author Arun Gupta

‎cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletCurrent.java

-95
This file was deleted.

‎cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletInject.java

-96
This file was deleted.

‎cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletJNDI.java

-103
This file was deleted.

‎cdi/beanmanager/src/main/webapp/WEB-INF/beans.xml

Whitespace-only changes.

0 commit comments

Comments
 (0)