rename to whatsmars-javase

README.md

@@ -15,7 +15,7 @@ whatsmars-dbrouter | 分库分表实现
 whatsmars-dubbo | 阿里分布式RPC(服务化)框架
 whatsmars-earth | springmvc+velocity实战
 whatsmars-elasticjob | 分布式调度
-whatsmars-javase-example | Java基础 & 新特性
+whatsmars-javase | Java基础 & 新特性
 whatsmars-mq | 消息中间件rocketmq,activemq
 whatsmars-redis | redis客户端简单封装
 whatsmars-rpc | RPC & Protocol

pom.xml

@@ -11,7 +11,7 @@
     <modules>
         <module>whatsmars-common</module>
         <module>whatsmars-tomcat</module>
-        <module>whatsmars-javase-example</module>
+        <module>whatsmars-javase</module>
         <module>whatsmars-spring</module>
         <module>whatsmars-spring-boot</module>
         <module>whatsmars-dbrouter</module>

whatsmars-javase-example/pom.xml → whatsmars-javase/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>whatsmars-javase-example</artifactId>
+    <artifactId>whatsmars-javase</artifactId>
     <packaging>jar</packaging>
     <name>${project.artifactId}</name>
     <url>http://maven.apache.org</url>

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/CodeBlockTest.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/CodeBlockTest.java

-package org.hongxi.whatsmars.base;
+package org.hongxi.whatsmars.javase;
 
 /**
  * Created by shenhongxi on 2017/11/17.

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/PropertiesUtils.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/PropertiesUtils.java

-package org.hongxi.whatsmars.base;
+package org.hongxi.whatsmars.javase;
 
 import java.io.InputStream;
 import java.util.Properties;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/Singleton.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/Singleton.java

-package org.hongxi.whatsmars.base;
+package org.hongxi.whatsmars.javase;
 
 import java.io.*;
 import java.lang.reflect.Constructor;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/WrapTest.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/WrapTest.java

-package org.hongxi.whatsmars.base;
+package org.hongxi.whatsmars.javase;
 
 /**
  * Created by shenhongxi on 15/7/27.

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/collection/ListTest.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/collection/ListTest.java

-package org.hongxi.whatsmars.base.collection;
+package org.hongxi.whatsmars.javase.collection;
 
 import java.util.ArrayList;
 import java.util.LinkedList;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/collection/MapTest.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/collection/MapTest.java

-package org.hongxi.whatsmars.base.collection;
+package org.hongxi.whatsmars.javase.collection;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
  * Created by shenhongxi on 15/7/28.

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/collection/Point.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/collection/Point.java

-package org.hongxi.whatsmars.base.collection;
+package org.hongxi.whatsmars.javase.collection;
 
 /**
  * Created by shenhongxi on 2016/6/14.

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/collection/UnmodifiableTest.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/collection/UnmodifiableTest.java

-package org.hongxi.whatsmars.base.collection;
+package org.hongxi.whatsmars.javase.collection;
 
 import java.util.Collections;
 import java.util.HashMap;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/Car.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/Car.java

-package org.hongxi.whatsmars.base.dp.factory;
+package org.hongxi.whatsmars.javase.dp.factory;
 
 public class Car implements Moveable {
 	private static Car car = new Car();//单例

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/CarFactory.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/CarFactory.java

-package org.hongxi.whatsmars.base.dp.factory;
+package org.hongxi.whatsmars.javase.dp.factory;
 
 public class CarFactory extends VehicleFactory {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/Moveable.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/Moveable.java

-package org.hongxi.whatsmars.base.dp.factory;
+package org.hongxi.whatsmars.javase.dp.factory;
 
 public interface Moveable {
 	void run();

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/Plane.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/Plane.java

-package org.hongxi.whatsmars.base.dp.factory;
+package org.hongxi.whatsmars.javase.dp.factory;
 
 public class Plane implements Moveable {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/PlaneFactory.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/PlaneFactory.java

-package org.hongxi.whatsmars.base.dp.factory;
+package org.hongxi.whatsmars.javase.dp.factory;
 
 public class PlaneFactory extends VehicleFactory {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/Test.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/Test.java

-package org.hongxi.whatsmars.base.dp.factory;
+package org.hongxi.whatsmars.javase.dp.factory;
 
 public class Test {
 	public static void main(String[] args) {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/VehicleFactory.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/VehicleFactory.java

-package org.hongxi.whatsmars.base.dp.factory;
+package org.hongxi.whatsmars.javase.dp.factory;
 
 public abstract class VehicleFactory {
 	abstract Moveable create();

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/AK47.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/AK47.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public class AK47 extends Weapon {
 	public void shoot() {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/AbstractFactory.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/AbstractFactory.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public abstract class AbstractFactory {
 	abstract Vehicle createVehicle();

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/Apple.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/Apple.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public class Apple extends Food {
 	public void printName() {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/Broom.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/Broom.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public class Broom extends Vehicle {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/Car.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/Car.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public class Car extends Vehicle {
 	

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/DefaultFactory.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/DefaultFactory.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public class DefaultFactory extends AbstractFactory {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/Food.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/Food.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public abstract class Food {
 	abstract void printName();

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/MagicFactory.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/MagicFactory.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public class MagicFactory extends AbstractFactory {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/MagicStick.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/MagicStick.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public class MagicStick extends Weapon {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/Mushroom.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/Mushroom.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public class Mushroom extends Food {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/Test.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/Test.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public class Test {
 	public static void main(String[] args) {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/Vehicle.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/Vehicle.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public abstract class Vehicle {
 	abstract void run();

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/factory/abstractfac/Weapon.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/factory/abstractfac/Weapon.java

-package org.hongxi.whatsmars.base.dp.factory.abstractfac;
+package org.hongxi.whatsmars.javase.dp.factory.abstractfac;
 
 public abstract class Weapon {
 	abstract void shoot();

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/FaceFilter.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/FaceFilter.java

-package org.hongxi.whatsmars.base.dp.filter;
+package org.hongxi.whatsmars.javase.dp.filter;
 
 public class FaceFilter implements Filter {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/Filter.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/Filter.java

-package org.hongxi.whatsmars.base.dp.filter;
+package org.hongxi.whatsmars.javase.dp.filter;
 
 public interface Filter {
 	String doFilter(String str);

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/FilterChain.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/FilterChain.java

-package org.hongxi.whatsmars.base.dp.filter;
+package org.hongxi.whatsmars.javase.dp.filter;
 
 import java.util.ArrayList;
 import java.util.List;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/HTMLFilter.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/HTMLFilter.java

-package org.hongxi.whatsmars.base.dp.filter;
+package org.hongxi.whatsmars.javase.dp.filter;
 
 public class HTMLFilter implements Filter {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/Main.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/Main.java

-package org.hongxi.whatsmars.base.dp.filter;
+package org.hongxi.whatsmars.javase.dp.filter;
 
 public class Main {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/MsgProcessor.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/MsgProcessor.java

-package org.hongxi.whatsmars.base.dp.filter;
+package org.hongxi.whatsmars.javase.dp.filter;
 
 public class MsgProcessor {
 	private String msg;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/PrinterSample.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/PrinterSample.java

-package org.hongxi.whatsmars.base.dp.filter;
+package org.hongxi.whatsmars.javase.dp.filter;
 
 import java.nio.charset.Charset;
 import java.util.zip.Adler32;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/SensitiveFilter.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/SensitiveFilter.java

-package org.hongxi.whatsmars.base.dp.filter;
+package org.hongxi.whatsmars.javase.dp.filter;
 
 public class SensitiveFilter implements Filter {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/web/Filter.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/web/Filter.java

-package org.hongxi.whatsmars.base.dp.filter.web;
+package org.hongxi.whatsmars.javase.dp.filter.web;
 
 public interface Filter {
 	void doFilter(Request request, Response response, FilterChain fc);

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/web/FilterChain.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/web/FilterChain.java

-package org.hongxi.whatsmars.base.dp.filter.web;
+package org.hongxi.whatsmars.javase.dp.filter.web;
 
 import java.util.ArrayList;
 import java.util.List;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/web/HTMLFilter.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/web/HTMLFilter.java

-package org.hongxi.whatsmars.base.dp.filter.web;
+package org.hongxi.whatsmars.javase.dp.filter.web;
 
 public class HTMLFilter implements Filter {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/web/Main.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/web/Main.java

-package org.hongxi.whatsmars.base.dp.filter.web;
+package org.hongxi.whatsmars.javase.dp.filter.web;
 
 /*
  * ��ͼ���

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/web/Request.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/web/Request.java

-package org.hongxi.whatsmars.base.dp.filter.web;
+package org.hongxi.whatsmars.javase.dp.filter.web;
 
 public class Request {
 	String requestStr;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/web/Response.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/web/Response.java

-package org.hongxi.whatsmars.base.dp.filter.web;
+package org.hongxi.whatsmars.javase.dp.filter.web;
 
 public class Response {
 	String responseStr;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/filter/web/SensitiveFilter.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/filter/web/SensitiveFilter.java

-package org.hongxi.whatsmars.base.dp.filter.web;
+package org.hongxi.whatsmars.javase.dp.filter.web;
 
 public class SensitiveFilter implements Filter {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/iterator/ArrayList.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/iterator/ArrayList.java

-package org.hongxi.whatsmars.base.dp.iterator;
+package org.hongxi.whatsmars.javase.dp.iterator;
 
 public class ArrayList implements Collection {
 	Object[] objects = new Object[10];

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/iterator/Cat.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/iterator/Cat.java

-package org.hongxi.whatsmars.base.dp.iterator;
+package org.hongxi.whatsmars.javase.dp.iterator;
 
 public class Cat {
 	public Cat(int id) {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/iterator/Collection.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/iterator/Collection.java

-package org.hongxi.whatsmars.base.dp.iterator;
+package org.hongxi.whatsmars.javase.dp.iterator;
 
 public interface Collection {
 	void add(Object o);

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/iterator/GenericArrayList.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/iterator/GenericArrayList.java

-package org.hongxi.whatsmars.base.dp.iterator;
+package org.hongxi.whatsmars.javase.dp.iterator;
 
 public class GenericArrayList<E> {
 	Object[] objects = new Object[10];

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/iterator/Iterator.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/iterator/Iterator.java

-package org.hongxi.whatsmars.base.dp.iterator;
+package org.hongxi.whatsmars.javase.dp.iterator;
 
 public interface Iterator {
 	Object next();

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/iterator/LinkedList.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/iterator/LinkedList.java

-package org.hongxi.whatsmars.base.dp.iterator;
+package org.hongxi.whatsmars.javase.dp.iterator;
 
 
 public class LinkedList implements Collection {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/iterator/Node.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/iterator/Node.java

-package org.hongxi.whatsmars.base.dp.iterator;
+package org.hongxi.whatsmars.javase.dp.iterator;
 
 public class Node {
 	public Node(Object data, Node next) {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/iterator/Test.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/iterator/Test.java

-package org.hongxi.whatsmars.base.dp.iterator;
+package org.hongxi.whatsmars.javase.dp.iterator;
 
 
 public class Test {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/observer/ObserverSample.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/observer/ObserverSample.java

-package org.hongxi.whatsmars.base.dp.observer;
+package org.hongxi.whatsmars.javase.dp.observer;
 
 import java.util.Observable;
 import java.util.Observer;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/observer/Test.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/observer/Test.java

-package org.hongxi.whatsmars.base.dp.observer;
+package org.hongxi.whatsmars.javase.dp.observer;
 
 import java.util.List;
 import java.util.ArrayList;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/proxy/Client.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/proxy/Client.java

-package org.hongxi.whatsmars.base.dp.proxy;
+package org.hongxi.whatsmars.javase.dp.proxy;
 
 
 public class Client {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/proxy/InvocationHandler.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/proxy/InvocationHandler.java

-package org.hongxi.whatsmars.base.dp.proxy;
+package org.hongxi.whatsmars.javase.dp.proxy;
 
 import java.lang.reflect.Method;
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/proxy/Moveable.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/proxy/Moveable.java

-package org.hongxi.whatsmars.base.dp.proxy;
+package org.hongxi.whatsmars.javase.dp.proxy;
 
 public interface Moveable {
 	void move();

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/proxy/Proxy.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/proxy/Proxy.java

-package org.hongxi.whatsmars.base.dp.proxy;
+package org.hongxi.whatsmars.javase.dp.proxy;
 
 import java.io.File;
 import java.io.FileWriter;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/proxy/Tank.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/proxy/Tank.java

-package org.hongxi.whatsmars.base.dp.proxy;
+package org.hongxi.whatsmars.javase.dp.proxy;
 
 import java.util.Random;
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/proxy/Test1.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/proxy/Test1.java

-package org.hongxi.whatsmars.base.dp.proxy;
+package org.hongxi.whatsmars.javase.dp.proxy;
 
 import java.io.File;
 import java.io.FileWriter;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/proxy/Test2.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/proxy/Test2.java

-package org.hongxi.whatsmars.base.dp.proxy;
+package org.hongxi.whatsmars.javase.dp.proxy;
 
 import java.lang.reflect.Method;
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/proxy/TimeHandler.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/proxy/TimeHandler.java

-package org.hongxi.whatsmars.base.dp.proxy;
+package org.hongxi.whatsmars.javase.dp.proxy;
 
 import java.lang.reflect.Method;
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/proxy/test/Client.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/proxy/test/Client.java

-package org.hongxi.whatsmars.base.dp.proxy.test;
+package org.hongxi.whatsmars.javase.dp.proxy.test;
 
-import org.hongxi.whatsmars.base.dp.proxy.InvocationHandler;
-import org.hongxi.whatsmars.base.dp.proxy.Proxy;
+import org.hongxi.whatsmars.javase.dp.proxy.InvocationHandler;
+import org.hongxi.whatsmars.javase.dp.proxy.Proxy;
 
 public class Client {
 	public static void main(String[] args) throws Exception {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/proxy/test/TransactionHandler.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/proxy/test/TransactionHandler.java

-package org.hongxi.whatsmars.base.dp.proxy.test;
+package org.hongxi.whatsmars.javase.dp.proxy.test;
 
 import java.lang.reflect.Method;
 
-import org.hongxi.whatsmars.base.dp.proxy.InvocationHandler;
+import org.hongxi.whatsmars.javase.dp.proxy.InvocationHandler;
 
 public class TransactionHandler implements InvocationHandler {
 	

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/proxy/test/UserMgr.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/proxy/test/UserMgr.java

-package org.hongxi.whatsmars.base.dp.proxy.test;
+package org.hongxi.whatsmars.javase.dp.proxy.test;
 
 public interface UserMgr {
 	void addUser();

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/dp/proxy/test/UserMgrImpl.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/dp/proxy/test/UserMgrImpl.java

-package org.hongxi.whatsmars.base.dp.proxy.test;
+package org.hongxi.whatsmars.javase.dp.proxy.test;
 
 public class UserMgrImpl implements UserMgr {
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/exception/ExTest.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/exception/ExTest.java

-package org.hongxi.whatsmars.base.exception;
+package org.hongxi.whatsmars.javase.exception;
 
 /**
  * Created by shenhongxi on 2018/6/1.

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/lambda/collection/CollectionFactory.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/lambda/collection/CollectionFactory.java

-package org.hongxi.whatsmars.base.lambda.collection;
+package org.hongxi.whatsmars.javase.lambda.collection;
 
 import java.util.function.Supplier;
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/lambda/collection/MyCollection.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/lambda/collection/MyCollection.java

-package org.hongxi.whatsmars.base.lambda.collection;
+package org.hongxi.whatsmars.javase.lambda.collection;
 
 /**
  * Created by shenhongxi on 2018/1/11.

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/lambda/collection/MyList.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/lambda/collection/MyList.java

-package org.hongxi.whatsmars.base.lambda.collection;
+package org.hongxi.whatsmars.javase.lambda.collection;
 
 /**
  * Created by shenhongxi on 2018/1/11.

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/lambda/collection/NewList.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/lambda/collection/NewList.java

-package org.hongxi.whatsmars.base.lambda.collection;
+package org.hongxi.whatsmars.javase.lambda.collection;
 
 /**
  * Created by shenhongxi on 2018/1/11.

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/lambda/collection/Test.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/lambda/collection/Test.java

-package org.hongxi.whatsmars.base.lambda.collection;
+package org.hongxi.whatsmars.javase.lambda.collection;
 
 /**
  * Created by shenhongxi on 2018/1/11.

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/lambda/stream/Status.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/lambda/stream/Status.java

-package org.hongxi.whatsmars.base.lambda.stream;
+package org.hongxi.whatsmars.javase.lambda.stream;
 
 /**
  * Created by shenhongxi on 2018/1/11.

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/lambda/stream/Task.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/lambda/stream/Task.java

-package org.hongxi.whatsmars.base.lambda.stream;
+package org.hongxi.whatsmars.javase.lambda.stream;
 
 /**
  * Created by shenhongxi on 2018/1/11.

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/lambda/stream/Test.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/lambda/stream/Test.java

-package org.hongxi.whatsmars.base.lambda.stream;
+package org.hongxi.whatsmars.javase.lambda.stream;
 
 import java.util.Arrays;
 import java.util.Collection;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/CopyFile.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/CopyFile.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
 import java.io.*;
 import java.nio.*;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/CreateArrayBuffer.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/CreateArrayBuffer.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
-import java.io.*;
 import java.nio.*;
-import java.nio.channels.*;
 
 public class CreateArrayBuffer
 {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/CreateBuffer.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/CreateBuffer.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
-import java.io.*;
 import java.nio.*;
-import java.nio.channels.*;
 
 public class CreateBuffer
 {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/FastCopyFile.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/FastCopyFile.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
 import java.io.*;
 import java.nio.*;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/MultiPortEcho.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/MultiPortEcho.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
 import java.io.*;
 import java.net.*;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/ReadAndShow.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/ReadAndShow.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
 import java.io.*;
 import java.nio.*;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/SliceBuffer.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/SliceBuffer.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
-import java.io.*;
 import java.nio.*;
-import java.nio.channels.*;
 
 public class SliceBuffer
 {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/TypesInByteBuffer.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/TypesInByteBuffer.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
-import java.io.*;
 import java.nio.*;
-import java.nio.channels.*;
 
 public class TypesInByteBuffer
 {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/UseCharsets.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/UseCharsets.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
 import java.io.*;
 import java.nio.*;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/UseFileLocks.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/UseFileLocks.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
 import java.io.*;
-import java.nio.*;
 import java.nio.channels.*;
 
 public class UseFileLocks

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/UseFloatBuffer.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/UseFloatBuffer.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
 import java.nio.*;
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/UseMappedFile.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/UseMappedFile.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
 import java.io.*;
 import java.nio.*;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/UseScatterGather.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/UseScatterGather.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
-import java.io.*;
 import java.net.*;
 import java.nio.*;
 import java.nio.channels.*;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/WriteSomeBytes.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/WriteSomeBytes.java

-package org.hongxi.whatsmars.base.nio;// $Id$
+package org.hongxi.whatsmars.javase.nio;// $Id$
 
 import java.io.*;
 import java.nio.*;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/qing/ClientController.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/qing/ClientController.java

-package org.hongxi.whatsmars.base.nio.qing;
+package org.hongxi.whatsmars.javase.nio.qing;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/qing/Handler.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/qing/Handler.java

-package org.hongxi.whatsmars.base.nio.qing;
+package org.hongxi.whatsmars.javase.nio.qing;
 
 import java.nio.channels.SocketChannel;
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/qing/Packet.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/qing/Packet.java

-package org.hongxi.whatsmars.base.nio.qing;
+package org.hongxi.whatsmars.javase.nio.qing;
 
 import java.io.Serializable;
 import java.nio.ByteBuffer;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/qing/ServerController.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/qing/ServerController.java

-package org.hongxi.whatsmars.base.nio.qing;
+package org.hongxi.whatsmars.javase.nio.qing;
 
 import java.net.InetSocketAddress;
 import java.nio.channels.SelectionKey;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/qing/ServerHandler.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/qing/ServerHandler.java

-package org.hongxi.whatsmars.base.nio.qing;
+package org.hongxi.whatsmars.javase.nio.qing;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/nio/qing/TestMain.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/nio/qing/TestMain.java

-package org.hongxi.whatsmars.base.nio.qing;
+package org.hongxi.whatsmars.javase.nio.qing;
 
 
 public class TestMain {

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/rmi/Client.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/rmi/Client.java

-package org.hongxi.whatsmars.base.rmi;
+package org.hongxi.whatsmars.javase.rmi;
 
 import java.rmi.Naming;
 

whatsmars-javase-example/src/main/java/org/hongxi/whatsmars/base/rmi/Server.java → whatsmars-javase/src/main/java/org/hongxi/whatsmars/javase/rmi/Server.java

-package org.hongxi.whatsmars.base.rmi;
+package org.hongxi.whatsmars.javase.rmi;
 
 import java.rmi.Naming;
 import java.rmi.registry.LocateRegistry;