Merge pull request javaee-samples#315 from rhanus/master

fixed project's naming conventions
almaz1213 · Jul 8, 2015 · 5669bb3 · 5669bb3
2 parents a05d7eb + 6b84efd
commit 5669bb3
Show file tree

Hide file tree

Showing 15 changed files with 99 additions and 378 deletions.
diff --git a/cdi/README.md b/cdi/README.md
@@ -24,6 +24,9 @@ The [JSR 346](https://jcp.org/en/jsr/detail?id=346) updates and clarifications t
  - nobeans-el-injection
  - nobeans-el-injection-flowscoped
  - events
+ - events-conditional-reception
+ - instance
+ - instance-qualifiers
 
 ## How to run
 

diff --git a/cdi/beanmanager/pom.xml b/cdi/beanmanager/pom.xml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <modelVersion>4.0.0</modelVersion>
+<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">
+	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.javaee7</groupId>
-        <artifactId>cdi</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <groupId>org.javaee7</groupId>
-    <artifactId>cdi-beanmanager</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>war</packaging>
-    <name>Java EE 7 Sample: cdi - beanmanager</name>
+	<parent>
+		<groupId>org.javaee7</groupId>
+		<artifactId>cdi</artifactId>
+		<version>1.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>cdi-beanmanager</artifactId>
+	<name>Java EE 7 Sample: cdi - beanmanager</name>
 
-    <properties>
-        <netbeans.hint.deploy.server>gfv3ee6</netbeans.hint.deploy.server>
-    </properties>
 </project>
diff --git a/...aee7/cdisamples/beanmanager/Greeting.java → ...org/javaee7/cdi/beanmanager/Greeting.java b/...aee7/cdisamples/beanmanager/Greeting.java → ...org/javaee7/cdi/beanmanager/Greeting.java
@@ -1,4 +1,4 @@
-package org.javaee7.cdisamples.beanmanager;
+package org.javaee7.cdi.beanmanager;
 
 /**
  * @author Arun Gupta

diff --git a/...disamples/beanmanager/SimpleGreeting.java → ...vaee7/cdi/beanmanager/SimpleGreeting.java b/...disamples/beanmanager/SimpleGreeting.java → ...vaee7/cdi/beanmanager/SimpleGreeting.java
@@ -1,4 +1,4 @@
-package org.javaee7.cdisamples.beanmanager;
+package org.javaee7.cdi.beanmanager;
 
 /**
  * @author Arun Gupta

diff --git a/...disamples/beanmanager/SmileyGreeting.java → ...vaee7/cdi/beanmanager/SmileyGreeting.java b/...disamples/beanmanager/SmileyGreeting.java → ...vaee7/cdi/beanmanager/SmileyGreeting.java
@@ -1,4 +1,4 @@
-package org.javaee7.cdisamples.beanmanager;
+package org.javaee7.cdi.beanmanager;
 
 /**
  * @author Arun Gupta

diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletCurrent.java b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletCurrent.java
diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletInject.java b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletInject.java
diff --git a/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletJNDI.java b/cdi/beanmanager/src/main/java/org/javaee7/cdisamples/beanmanager/TestServletJNDI.java
diff --git a/cdi/beanmanager/src/main/webapp/WEB-INF/beans.xml b/cdi/beanmanager/src/main/webapp/WEB-INF/beans.xml