").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g
=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/abstract-factory/test-output/junitreports/TEST-com.iluwatar.AppTest.xml b/abstract-factory/test-output/junitreports/TEST-com.iluwatar.AppTest.xml
new file mode 100644
index 000000000000..0ace922a1037
--- /dev/null
+++ b/abstract-factory/test-output/junitreports/TEST-com.iluwatar.AppTest.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/abstract-factory/test-output/junitreports/TEST-nc.tc.com.iluwatar.AppTest.xml b/abstract-factory/test-output/junitreports/TEST-nc.tc.com.iluwatar.AppTest.xml
new file mode 100644
index 000000000000..bd0c16626099
--- /dev/null
+++ b/abstract-factory/test-output/junitreports/TEST-nc.tc.com.iluwatar.AppTest.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/abstract-factory/test-output/navigator-bullet.png b/abstract-factory/test-output/navigator-bullet.png
new file mode 100644
index 000000000000..36d90d395c51
Binary files /dev/null and b/abstract-factory/test-output/navigator-bullet.png differ
diff --git a/abstract-factory/test-output/old/Default suite/Default test.properties b/abstract-factory/test-output/old/Default suite/Default test.properties
new file mode 100644
index 000000000000..37da032f9d0c
--- /dev/null
+++ b/abstract-factory/test-output/old/Default suite/Default test.properties
@@ -0,0 +1 @@
+[SuiteResult context=Default test]
\ No newline at end of file
diff --git a/abstract-factory/test-output/old/Default suite/classes.html b/abstract-factory/test-output/old/Default suite/classes.html
new file mode 100644
index 000000000000..d86fecc02600
--- /dev/null
+++ b/abstract-factory/test-output/old/Default suite/classes.html
@@ -0,0 +1,32 @@
+
+
+| Class name |
+Method name |
+Groups |
+
+| com.iluwatar.AppTest |
+ | |
+
+| @Test |
+
+
+| |
+createKingdom |
+ |
+
+| |
+main |
+ |
+
+| @BeforeClass |
+
+
+| @BeforeMethod |
+
+
+| @AfterMethod |
+
+
+| @AfterClass |
+
+
diff --git a/abstract-factory/test-output/old/Default suite/groups.html b/abstract-factory/test-output/old/Default suite/groups.html
new file mode 100644
index 000000000000..199cb3f11888
--- /dev/null
+++ b/abstract-factory/test-output/old/Default suite/groups.html
@@ -0,0 +1 @@
+Groups used for this test run
\ No newline at end of file
diff --git a/abstract-factory/test-output/old/Default suite/index.html b/abstract-factory/test-output/old/Default suite/index.html
new file mode 100644
index 000000000000..8ed202c3be37
--- /dev/null
+++ b/abstract-factory/test-output/old/Default suite/index.html
@@ -0,0 +1,6 @@
+Results for Default suite
+
+
diff --git a/abstract-factory/test-output/old/Default suite/main.html b/abstract-factory/test-output/old/Default suite/main.html
new file mode 100644
index 000000000000..5888ae0744dd
--- /dev/null
+++ b/abstract-factory/test-output/old/Default suite/main.html
@@ -0,0 +1,2 @@
+Results for Default suite
+Select a result on the left-hand pane.
diff --git a/abstract-factory/test-output/old/Default suite/methods-alphabetical.html b/abstract-factory/test-output/old/Default suite/methods-alphabetical.html
new file mode 100644
index 000000000000..c6fdd1b53648
--- /dev/null
+++ b/abstract-factory/test-output/old/Default suite/methods-alphabetical.html
@@ -0,0 +1,8 @@
+Methods run, sorted chronologically
>> means before, << means after
Default suite(Hover the method name to see the test class name)
+
+| Time | Delta (ms) | Suite
configuration | Test
configuration | Class
configuration | Groups
configuration | Method
configuration | Test
method | Thread | Instances |
|---|
+ | 14/09/30 14:44:17 | 0 | | | | | | createKingdom |
+ main@1957306 | |
+ | 14/09/30 14:44:17 | 74 | | | | | | main |
+ main@1957306 | |
+
diff --git a/abstract-factory/test-output/old/Default suite/methods-not-run.html b/abstract-factory/test-output/old/Default suite/methods-not-run.html
new file mode 100644
index 000000000000..54b14cb854b6
--- /dev/null
+++ b/abstract-factory/test-output/old/Default suite/methods-not-run.html
@@ -0,0 +1,2 @@
+Methods that were not run
\ No newline at end of file
diff --git a/abstract-factory/test-output/old/Default suite/methods.html b/abstract-factory/test-output/old/Default suite/methods.html
new file mode 100644
index 000000000000..c6fdd1b53648
--- /dev/null
+++ b/abstract-factory/test-output/old/Default suite/methods.html
@@ -0,0 +1,8 @@
+Methods run, sorted chronologically
>> means before, << means after
Default suite(Hover the method name to see the test class name)
+
+| Time | Delta (ms) | Suite
configuration | Test
configuration | Class
configuration | Groups
configuration | Method
configuration | Test
method | Thread | Instances |
|---|
+ | 14/09/30 14:44:17 | 0 | | | | | | createKingdom |
+ main@1957306 | |
+ | 14/09/30 14:44:17 | 74 | | | | | | main |
+ main@1957306 | |
+
diff --git a/abstract-factory/test-output/old/Default suite/reporter-output.html b/abstract-factory/test-output/old/Default suite/reporter-output.html
new file mode 100644
index 000000000000..063bc2e96fd0
--- /dev/null
+++ b/abstract-factory/test-output/old/Default suite/reporter-output.html
@@ -0,0 +1 @@
+Reporter output
\ No newline at end of file
diff --git a/abstract-factory/test-output/old/Default suite/testng.xml.html b/abstract-factory/test-output/old/Default suite/testng.xml.html
new file mode 100644
index 000000000000..fb746ab57551
--- /dev/null
+++ b/abstract-factory/test-output/old/Default suite/testng.xml.html
@@ -0,0 +1 @@
+testng.xml for Default suite<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="Default suite">
<test verbose="2" name="Default test">
<classes>
<class name="com.iluwatar.AppTest"/>
</classes>
</test> <!-- Default test -->
</suite> <!-- Default suite -->
\ No newline at end of file
diff --git a/abstract-factory/test-output/old/Default suite/toc.html b/abstract-factory/test-output/old/Default suite/toc.html
new file mode 100644
index 000000000000..4211d4ca09e3
--- /dev/null
+++ b/abstract-factory/test-output/old/Default suite/toc.html
@@ -0,0 +1,30 @@
+
+
+Results for Default suite
+
+
+
+
+Results for
Default suite
+
+
+
\ No newline at end of file
diff --git a/abstract-factory/test-output/old/index.html b/abstract-factory/test-output/old/index.html
new file mode 100644
index 000000000000..593955c38cc9
--- /dev/null
+++ b/abstract-factory/test-output/old/index.html
@@ -0,0 +1,9 @@
+
+Test results
+
+
+Test results
+| Suite | Passed | Failed | Skipped | testng.xml |
|---|
+| Total | 2 | 0 | 0 | |
+| Default suite |
+2 | 0 | 0 | Link |
diff --git a/abstract-factory/test-output/passed.png b/abstract-factory/test-output/passed.png
new file mode 100644
index 000000000000..45e85bbfd0f5
Binary files /dev/null and b/abstract-factory/test-output/passed.png differ
diff --git a/abstract-factory/test-output/skipped.png b/abstract-factory/test-output/skipped.png
new file mode 100644
index 000000000000..c36a324398f7
Binary files /dev/null and b/abstract-factory/test-output/skipped.png differ
diff --git a/abstract-factory/test-output/testng-failed.xml b/abstract-factory/test-output/testng-failed.xml
new file mode 100644
index 000000000000..f72314e6397a
--- /dev/null
+++ b/abstract-factory/test-output/testng-failed.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/abstract-factory/test-output/testng-reports.css b/abstract-factory/test-output/testng-reports.css
new file mode 100644
index 000000000000..16dfbdcf1c62
--- /dev/null
+++ b/abstract-factory/test-output/testng-reports.css
@@ -0,0 +1,304 @@
+body {
+ margin: 0px 0px 5px 5px;
+}
+
+ul {
+ margin: 0px;
+}
+
+li {
+ list-style-type: none;
+}
+
+a {
+ text-decoration: none;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+
+.navigator-selected {
+ background: #ffa500;
+}
+
+.wrapper {
+ overflow: hidden;
+}
+
+.navigator-root {
+ margin-top: 60px;
+ float: left;
+ width: 400px;
+ height: 100%;
+ overflow-y: auto;
+}
+
+.main-panel-root {
+ margin-top: 60px;
+}
+
+.suite {
+ margin: 0px 10px 10px 0px;
+ background-color: #fff8dc;
+}
+
+.suite-name {
+ padding-left: 10px;
+ font-size: 25px;
+ font-family: Times;
+}
+
+.main-panel-header {
+ padding: 5px;
+ background-color: #9FB4D9; //afeeee;
+ font-family: monospace;
+ font-size: 18px;
+}
+
+.main-panel-content {
+ padding: 5px;
+ margin-bottom: 10px;
+ background-color: #DEE8FC; //d0ffff;
+}
+
+.rounded-window {
+ border-radius: 10px;
+ border-style: solid;
+ border-width: 1px;
+}
+
+.rounded-window-top {
+ border-top-right-radius: 10px 10px;
+ border-top-left-radius: 10px 10px;
+ border-style: solid;
+ border-width: 1px;
+ overflow: auto;
+}
+
+.light-rounded-window-top {
+ border-top-right-radius: 10px 10px;
+ border-top-left-radius: 10px 10px;
+}
+
+.rounded-window-bottom {
+ border-style: solid;
+ border-width: 0px 1px 1px 1px;
+ border-bottom-right-radius: 10px 10px;
+ border-bottom-left-radius: 10px 10px;
+ overflow: auto;
+}
+
+.method-name {
+ font-size: 12px;
+ font-family: monospace;
+}
+
+.method-content {
+ border-style: solid;
+ border-width: 0px 0px 1px 0px;
+ margin-bottom: 10;
+ padding-bottom: 5px;
+ width: 80%;
+}
+
+.parameters {
+ font-size: 14px;
+ font-family: monospace;
+}
+
+.stack-trace {
+ white-space: pre;
+ font-family: monospace;
+ font-size: 12px;
+ margin-top: 0px;
+ margin-left: 20px;
+}
+
+.testng-xml {
+ font-family: monospace;
+}
+
+.method-list-content {
+ margin-left: 10px;
+}
+
+.navigator-suite-content {
+ margin-left: 10px;
+ font: 12px 'Lucida Grande';
+}
+
+.suite-section-title {
+ margin-top: 10px;
+ width: 80%;
+ border-style: solid;
+ border-width: 1px 0px 0px 0px;
+ font-family: Times;
+ font-size: 18px;
+ font-weight: bold;
+}
+
+.suite-section-content {
+ list-style-image: url(bullet_point.png);
+}
+
+.top-banner-root {
+ position: fixed;
+ width: 100%;
+ padding: 5px;
+ margin: 0px 0px 5px 0px;
+ height: 45px;
+ background-color: #0066ff;
+ font-family: Times;
+ color: #fff;
+ text-align: center;
+}
+
+.top-banner-title-font {
+ font-size: 25px;
+}
+
+.test-name {
+ font-family: 'Lucida Grande';
+ font-size: 16px;
+}
+
+.suite-icon {
+ padding: 5px;
+ float: right;
+ height: 20;
+}
+
+.test-group {
+ font: 20px 'Lucida Grande';
+ margin: 5px 5px 10px 5px;
+ border-width: 0px 0px 1px 0px;
+ border-style: solid;
+ padding: 5px;
+}
+
+.test-group-name {
+ font-weight: bold;
+}
+
+.method-in-group {
+ font-size: 16px;
+ margin-left: 80px;
+}
+
+table.google-visualization-table-table {
+ width: 100%;
+}
+
+.reporter-method-name {
+ font-size: 14px;
+ font-family: monospace;
+}
+
+.reporter-method-output-div {
+ padding: 5px;
+ margin: 0px 0px 5px 20px;
+ font-size: 12px;
+ font-family: monospace;
+ border-width: 0px 0px 0px 1px;
+ border-style: solid;
+}
+
+.ignored-class-div {
+ font-size: 14px;
+ font-family: monospace;
+}
+
+.ignored-methods-div {
+ padding: 5px;
+ margin: 0px 0px 5px 20px;
+ font-size: 12px;
+ font-family: monospace;
+ border-width: 0px 0px 0px 1px;
+ border-style: solid;
+}
+
+.border-failed {
+ border-top-left-radius: 10px 10px;
+ border-bottom-left-radius: 10px 10px;
+ border-style: solid;
+ border-width: 0px 0px 0px 10px;
+ border-color: #f00;
+}
+
+.border-skipped {
+ border-top-left-radius: 10px 10px;
+ border-bottom-left-radius: 10px 10px;
+ border-style: solid;
+ border-width: 0px 0px 0px 10px;
+ border-color: #edc600;
+}
+
+.border-passed {
+ border-top-left-radius: 10px 10px;
+ border-bottom-left-radius: 10px 10px;
+ border-style: solid;
+ border-width: 0px 0px 0px 10px;
+ border-color: #19f52d;
+}
+
+.times-div {
+ text-align: center;
+ padding: 5px;
+}
+
+.suite-total-time {
+ font: 16px 'Lucida Grande';
+}
+
+.configuration-suite {
+ margin-left: 20px;
+}
+
+.configuration-test {
+ margin-left: 40px;
+}
+
+.configuration-class {
+ margin-left: 60px;
+}
+
+.configuration-method {
+ margin-left: 80px;
+}
+
+.test-method {
+ margin-left: 100px;
+}
+
+.chronological-class {
+ background-color: #0ccff;
+ border-style: solid;
+ border-width: 0px 0px 1px 1px;
+}
+
+.method-start {
+ float: right;
+}
+
+.chronological-class-name {
+ padding: 0px 0px 0px 5px;
+ color: #008;
+}
+
+.after, .before, .test-method {
+ font-family: monospace;
+ font-size: 14px;
+}
+
+.navigator-suite-header {
+ font-size: 22px;
+ margin: 0px 10px 5px 0px;
+ background-color: #deb887;
+ text-align: center;
+}
+
+.collapse-all-icon {
+ padding: 5px;
+ float: right;
+}
diff --git a/abstract-factory/test-output/testng-reports.js b/abstract-factory/test-output/testng-reports.js
new file mode 100644
index 000000000000..c2ba487e6c70
--- /dev/null
+++ b/abstract-factory/test-output/testng-reports.js
@@ -0,0 +1,130 @@
+$(document).ready(function() {
+ $('a.navigator-link').click(function() {
+ // Extract the panel for this link
+ var panel = getPanelName($(this));
+
+ // Mark this link as currently selected
+ $('.navigator-link').parent().removeClass('navigator-selected');
+ $(this).parent().addClass('navigator-selected');
+
+ showPanel(panel);
+ });
+
+ installMethodHandlers('failed');
+ installMethodHandlers('skipped');
+ installMethodHandlers('passed', true); // hide passed methods by default
+
+ $('a.method').click(function() {
+ showMethod($(this));
+ return false;
+ });
+
+ // Hide all the panels and display the first one (do this last
+ // to make sure the click() will invoke the listeners)
+ $('.panel').hide();
+ $('.navigator-link').first().click();
+
+ // Collapse/expand the suites
+ $('a.collapse-all-link').click(function() {
+ var contents = $('.navigator-suite-content');
+ if (contents.css('display') == 'none') {
+ contents.show();
+ } else {
+ contents.hide();
+ }
+ });
+
+ // Keep the navigator div always visible
+ var $scrollingDiv = $(".navigator-root");
+ $(window).scroll(function() {
+ $scrollingDiv.css('height', $(window).height() - 65);
+ $scrollingDiv.stop()
+ .animate({"marginTop": ($(window).scrollTop() + 60) + "px"} );
+ });
+});
+
+// The handlers that take care of showing/hiding the methods
+function installMethodHandlers(name, hide) {
+ function getContent(t) {
+ return $('.method-list-content.' + name + "." + t.attr('panel-name'));
+ }
+
+ function getHideLink(t, name) {
+ var s = 'a.hide-methods.' + name + "." + t.attr('panel-name');
+ return $(s);
+ }
+
+ function getShowLink(t, name) {
+ return $('a.show-methods.' + name + "." + t.attr('panel-name'));
+ }
+
+ function getMethodPanelClassSel(element, name) {
+ var panelName = getPanelName(element);
+ var sel = '.' + panelName + "-class-" + name;
+ return $(sel);
+ }
+
+ $('a.hide-methods.' + name).click(function() {
+ var w = getContent($(this));
+ w.hide();
+ getHideLink($(this), name).hide();
+ getShowLink($(this), name).show();
+ getMethodPanelClassSel($(this), name).hide();
+ });
+
+ $('a.show-methods.' + name).click(function() {
+ var w = getContent($(this));
+ w.show();
+ getHideLink($(this), name).show();
+ getShowLink($(this), name).hide();
+ showPanel(getPanelName($(this)));
+ getMethodPanelClassSel($(this), name).show();
+ });
+
+ if (hide) {
+ $('a.hide-methods.' + name).click();
+ } else {
+ $('a.show-methods.' + name).click();
+ }
+}
+
+function getHashForMethod(element) {
+ return element.attr('hash-for-method');
+}
+
+function getPanelName(element) {
+ return element.attr('panel-name');
+}
+
+function showPanel(panelName) {
+ $('.panel').hide();
+ var panel = $('.panel[panel-name="' + panelName + '"]');
+ panel.show();
+}
+
+function showMethod(element) {
+ var hashTag = getHashForMethod(element);
+ var panelName = getPanelName(element);
+ showPanel(panelName);
+ var current = document.location.href;
+ var base = current.substring(0, current.indexOf('#'))
+ document.location.href = base + '#' + hashTag;
+ var newPosition = $(document).scrollTop() - 65;
+ $(document).scrollTop(newPosition);
+}
+
+function drawTable() {
+ for (var i = 0; i < suiteTableInitFunctions.length; i++) {
+ window[suiteTableInitFunctions[i]]();
+ }
+
+ for (var k in window.suiteTableData) {
+ var v = window.suiteTableData[k];
+ var div = v.tableDiv;
+ var data = v.tableData
+ var table = new google.visualization.Table(document.getElementById(div));
+ table.draw(data, {
+ showRowNumber : false
+ });
+ }
+}
diff --git a/abstract-factory/test-output/testng-results.xml b/abstract-factory/test-output/testng-results.xml
new file mode 100644
index 000000000000..ff2094a5652b
--- /dev/null
+++ b/abstract-factory/test-output/testng-results.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/abstract-factory/test-output/testng.css b/abstract-factory/test-output/testng.css
new file mode 100644
index 000000000000..5124ba863b37
--- /dev/null
+++ b/abstract-factory/test-output/testng.css
@@ -0,0 +1,9 @@
+.invocation-failed, .test-failed { background-color: #DD0000; }
+.invocation-percent, .test-percent { background-color: #006600; }
+.invocation-passed, .test-passed { background-color: #00AA00; }
+.invocation-skipped, .test-skipped { background-color: #CCCC00; }
+
+.main-page {
+ font-size: x-large;
+}
+
diff --git a/adapter/(default package).ucd b/adapter/(default package).ucd
new file mode 100644
index 000000000000..4923fdc4d502
--- /dev/null
+++ b/adapter/(default package).ucd
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/adapter/.euml2 b/adapter/.euml2
new file mode 100644
index 000000000000..42ca20e2ffde
--- /dev/null
+++ b/adapter/.euml2
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/adapter/.gitignore b/adapter/.gitignore
new file mode 100644
index 000000000000..5e56e040ec09
--- /dev/null
+++ b/adapter/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/adapter/.umlproject b/adapter/.umlproject
new file mode 100644
index 000000000000..e348ac9b6238
--- /dev/null
+++ b/adapter/.umlproject
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/adapter/adapter.iml b/adapter/adapter.iml
new file mode 100644
index 000000000000..57a0548ee6df
--- /dev/null
+++ b/adapter/adapter.iml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/adapter/adapter.usd b/adapter/adapter.usd
new file mode 100644
index 000000000000..a173ee83e2c9
--- /dev/null
+++ b/adapter/adapter.usd
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/adapter/out/.gitignore b/adapter/out/.gitignore
new file mode 100644
index 000000000000..5e56e040ec09
--- /dev/null
+++ b/adapter/out/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/adapter/src/java.usd b/adapter/src/java.usd
new file mode 100644
index 000000000000..a173ee83e2c9
--- /dev/null
+++ b/adapter/src/java.usd
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/adapter/src/main/java/com/iluwatar/App.java b/adapter/src/main/java/com/iluwatar/adapter/App.java
similarity index 93%
rename from adapter/src/main/java/com/iluwatar/App.java
rename to adapter/src/main/java/com/iluwatar/adapter/App.java
index 41e2495a9f72..0677b04f8adc 100644
--- a/adapter/src/main/java/com/iluwatar/App.java
+++ b/adapter/src/main/java/com/iluwatar/adapter/App.java
@@ -1,23 +1,23 @@
-package com.iluwatar;
-
-/**
- *
- * There are two variations of the Adapter pattern: The
- * class adapter implements the adaptee's interface whereas
- * the object adapter uses composition to contain the adaptee
- * in the adapter object. This example uses the object adapter
- * approach.
- *
- * The Adapter (GnomeEngineer) converts the interface of the
- * target class (GoblinGlider) into a suitable one expected
- * by the client (GnomeEngineeringManager).
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- GnomeEngineeringManager manager = new GnomeEngineeringManager();
- manager.operateDevice();
- }
-}
+package com.iluwatar.adapter;
+
+/**
+ *
+ * There are two variations of the Adapter pattern: The
+ * class adapter implements the adaptee's interface whereas
+ * the object adapter uses composition to contain the adaptee
+ * in the adapter object. This example uses the object adapter
+ * approach.
+ *
+ * The Adapter (GnomeEngineer) converts the interface of the
+ * target class (GoblinGlider) into a suitable one expected
+ * by the client (GnomeEngineeringManager).
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ GnomeEngineeringManager manager = new GnomeEngineeringManager();
+ manager.operateDevice();
+ }
+}
diff --git a/adapter/src/main/java/com/iluwatar/Engineer.java b/adapter/src/main/java/com/iluwatar/adapter/Engineer.java
similarity index 75%
rename from adapter/src/main/java/com/iluwatar/Engineer.java
rename to adapter/src/main/java/com/iluwatar/adapter/Engineer.java
index d8289df7d95e..1ec0a69bdc9b 100644
--- a/adapter/src/main/java/com/iluwatar/Engineer.java
+++ b/adapter/src/main/java/com/iluwatar/adapter/Engineer.java
@@ -1,12 +1,12 @@
-package com.iluwatar;
-
-/**
- *
- * Engineers can operate devices.
- *
- */
-public interface Engineer {
-
- void operateDevice();
-
-}
+package com.iluwatar.adapter;
+
+/**
+ *
+ * Engineers can operate devices.
+ *
+ */
+public interface Engineer {
+
+ void operateDevice();
+
+}
diff --git a/adapter/src/main/java/com/iluwatar/GnomeEngineer.java b/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineer.java
similarity index 78%
rename from adapter/src/main/java/com/iluwatar/GnomeEngineer.java
rename to adapter/src/main/java/com/iluwatar/adapter/GnomeEngineer.java
index 92fc5aea82b9..edd67de764fe 100644
--- a/adapter/src/main/java/com/iluwatar/GnomeEngineer.java
+++ b/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineer.java
@@ -1,25 +1,29 @@
-package com.iluwatar;
-
-/**
- *
- * Adapter class. Adapts the interface of the device
- * (GoblinGlider) into Engineer interface expected
- * by the client (GnomeEngineeringManager).
- *
- */
-public class GnomeEngineer implements Engineer {
-
- private GoblinGlider glider;
-
- public GnomeEngineer() {
- glider = new GoblinGlider();
- }
-
- @Override
- public void operateDevice() {
- glider.attachGlider();
- glider.gainSpeed();
- glider.takeOff();
- }
-
-}
+package com.iluwatar.adapter;
+
+/**
+ *
+ * Adapter class. Adapts the interface of the device
+ * (GoblinGlider) into Engineer interface expected
+ * by the client (GnomeEngineeringManager).
+ *
+ */
+public class GnomeEngineer implements Engineer {
+
+ /**
+ * @uml.property name="glider"
+ * @uml.associationEnd multiplicity="(1 1)"
+ */
+ private GoblinGlider glider;
+
+ public GnomeEngineer() {
+ glider = new GoblinGlider();
+ }
+
+ @Override
+ public void operateDevice() {
+ glider.attachGlider();
+ glider.gainSpeed();
+ glider.takeOff();
+ }
+
+}
diff --git a/adapter/src/main/java/com/iluwatar/GnomeEngineeringManager.java b/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineeringManager.java
similarity index 72%
rename from adapter/src/main/java/com/iluwatar/GnomeEngineeringManager.java
rename to adapter/src/main/java/com/iluwatar/adapter/GnomeEngineeringManager.java
index af3467d30409..dd8ee0e4da5b 100644
--- a/adapter/src/main/java/com/iluwatar/GnomeEngineeringManager.java
+++ b/adapter/src/main/java/com/iluwatar/adapter/GnomeEngineeringManager.java
@@ -1,21 +1,25 @@
-package com.iluwatar;
-
-/**
- *
- * GnomeEngineering manager uses Engineer to
- * operate devices.
- *
- */
-public class GnomeEngineeringManager implements Engineer {
-
- private Engineer engineer;
-
- public GnomeEngineeringManager() {
- engineer = new GnomeEngineer();
- }
-
- @Override
- public void operateDevice() {
- engineer.operateDevice();
- }
-}
+package com.iluwatar.adapter;
+
+/**
+ *
+ * GnomeEngineering manager uses Engineer to
+ * operate devices.
+ *
+ */
+public class GnomeEngineeringManager implements Engineer {
+
+ /**
+ * @uml.property name="engineer"
+ * @uml.associationEnd multiplicity="(1 1)"
+ */
+ private Engineer engineer;
+
+ public GnomeEngineeringManager() {
+ engineer = new GnomeEngineer();
+ }
+
+ @Override
+ public void operateDevice() {
+ engineer.operateDevice();
+ }
+}
diff --git a/adapter/src/main/java/com/iluwatar/GoblinGlider.java b/adapter/src/main/java/com/iluwatar/adapter/GoblinGlider.java
similarity index 87%
rename from adapter/src/main/java/com/iluwatar/GoblinGlider.java
rename to adapter/src/main/java/com/iluwatar/adapter/GoblinGlider.java
index a5bcd0722dc2..a97d4c384197 100644
--- a/adapter/src/main/java/com/iluwatar/GoblinGlider.java
+++ b/adapter/src/main/java/com/iluwatar/adapter/GoblinGlider.java
@@ -1,21 +1,21 @@
-package com.iluwatar;
-
-/**
- *
- * Device class (adaptee in the pattern).
- *
- */
-public class GoblinGlider {
-
- public void attachGlider() {
- System.out.println("Glider attached.");
- }
-
- public void gainSpeed() {
- System.out.println("Gaining speed.");
- }
-
- public void takeOff() {
- System.out.println("Lift-off!");
- }
-}
+package com.iluwatar.adapter;
+
+/**
+ *
+ * Device class (adaptee in the pattern).
+ *
+ */
+public class GoblinGlider {
+
+ public void attachGlider() {
+ System.out.println("Glider attached.");
+ }
+
+ public void gainSpeed() {
+ System.out.println("Gaining speed.");
+ }
+
+ public void takeOff() {
+ System.out.println("Lift-off!");
+ }
+}
diff --git a/adapter/src/test/log4j.xml b/adapter/src/test/log4j.xml
new file mode 100644
index 000000000000..748d0c1a5271
--- /dev/null
+++ b/adapter/src/test/log4j.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/adapter/src/test/resources/configure/UATApplicationContext.xml b/adapter/src/test/resources/configure/UATApplicationContext.xml
new file mode 100644
index 000000000000..818ef52f909e
--- /dev/null
+++ b/adapter/src/test/resources/configure/UATApplicationContext.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/adapter/src/test/resources/configure/prop.xml b/adapter/src/test/resources/configure/prop.xml
new file mode 100644
index 000000000000..c7afbd60d256
--- /dev/null
+++ b/adapter/src/test/resources/configure/prop.xml
@@ -0,0 +1,133 @@
+
+
+ false
+
+
+ $JAVA_HOME
+ server
+ -server -Xmx768m -XX:PermSize=128m -XX:MaxPermSize=256m -Duser.timezone=GMT+8 -Djava.awt.headless=true
+ 8005
+
+ 80
+
+
+
+ true
+
+ StartTomcat
+ nc.bs.tomcat.startup.BootStrapTomcatService
+ 15
+ true
+ false
+ start|stop
+
+
+ EJB_SERVICE
+ nc.bs.mw.naming.EJBContainerService
+ 15
+ true
+ false
+ start|stop
+
+ nc.bs.mw.tran.IerpTransactionManagerProxy
+ nc.bs.mw.tran.IerpUserTransaction
+ nc.bs.mw.tran.IerpTransactionManager
+ nc.bs.mw.sql.UFSqlObject
+ nc.bs.mw.ejbsql.IerpXADataSource
+
+ design
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ baptest807
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ bafi
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ bafi
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ iufo6103312
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ iufo6103312
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ batm
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ batm
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ bap8
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ bap8
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ foodmart
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ foodmart
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
\ No newline at end of file
diff --git a/adapter/src/test/resources/configure/test_data_source.xml b/adapter/src/test/resources/configure/test_data_source.xml
new file mode 100644
index 000000000000..2e45d5ee869c
--- /dev/null
+++ b/adapter/src/test/resources/configure/test_data_source.xml
@@ -0,0 +1,19 @@
+
+
+
+ design
+ Z
+ jdbc:sqlserver://uapxt02:1433;database=newwf_1010;sendStringParametersAsUnicode=false;responseBuffering=adaptive
+ sa
+ sasasa
+ com.microsoft.sqlserver.jdbc.SQLServerDriver
+ SQLSERVER2008
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
\ No newline at end of file
diff --git a/adapter/src/test/resources/configure/uat.properties b/adapter/src/test/resources/configure/uat.properties
new file mode 100644
index 000000000000..f0b076c2de77
--- /dev/null
+++ b/adapter/src/test/resources/configure/uat.properties
@@ -0,0 +1,33 @@
+#project information
+app_name=App Name
+app_version=V6.5
+
+#Common Configure
+##UAPHOME path, USE '/' for path separator
+nc_home=
+##verify log path, USE '/' for path separator
+log_file=debug.log
+
+# 0 don't print app log information on test result log
+# 1 only print app log information on test result log for fail testcase
+# 2 print application log information on test result log for all testcase
+uatlog_switch=2
+
+#dataFile Configure ,backup database data and restore database data
+data_backup_file = c:/temp/datafile.xml
+
+#default datasource
+default_datasource=design
+
+#BusinessServer configure
+serverstart=off
+login_username=
+login_password=
+
+#resources settings
+nc_configure_dir=resources/configure/
+testdata_config_dir=resources/data/conf/
+testdata_springfile_dir=resources/data/spring/
+testdata_objectfile_dir=resources/data/object/
+testdata_excelfile_dir=resources/data/excel/
+testdata_backup_dir=resources/data/backup/
diff --git a/adapter/src/test/resources/configure/uat_spring_conf.xml b/adapter/src/test/resources/configure/uat_spring_conf.xml
new file mode 100644
index 000000000000..169a91514700
--- /dev/null
+++ b/adapter/src/test/resources/configure/uat_spring_conf.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/adapter/src/test/resources/data/backup/README b/adapter/src/test/resources/data/backup/README
new file mode 100644
index 000000000000..a5b99861a7dc
--- /dev/null
+++ b/adapter/src/test/resources/data/backup/README
@@ -0,0 +1 @@
+备份文件夹
\ No newline at end of file
diff --git a/adapter/src/test/resources/data/config/README b/adapter/src/test/resources/data/config/README
new file mode 100644
index 000000000000..4849e2aef709
--- /dev/null
+++ b/adapter/src/test/resources/data/config/README
@@ -0,0 +1 @@
+Object配置文件夹
\ No newline at end of file
diff --git a/adapter/src/test/resources/data/excel/README b/adapter/src/test/resources/data/excel/README
new file mode 100644
index 000000000000..4849e2aef709
--- /dev/null
+++ b/adapter/src/test/resources/data/excel/README
@@ -0,0 +1 @@
+Object配置文件夹
\ No newline at end of file
diff --git a/adapter/src/test/resources/data/object/README b/adapter/src/test/resources/data/object/README
new file mode 100644
index 000000000000..271c286f3687
--- /dev/null
+++ b/adapter/src/test/resources/data/object/README
@@ -0,0 +1 @@
+固化结果文件夹
\ No newline at end of file
diff --git a/adapter/src/test/resources/data/spring/README b/adapter/src/test/resources/data/spring/README
new file mode 100644
index 000000000000..961ee7009fd2
--- /dev/null
+++ b/adapter/src/test/resources/data/spring/README
@@ -0,0 +1 @@
+spring 配置文件夹
\ No newline at end of file
diff --git a/adapter/src/test/resources/temp/README b/adapter/src/test/resources/temp/README
new file mode 100644
index 000000000000..ccffba66ffdd
--- /dev/null
+++ b/adapter/src/test/resources/temp/README
@@ -0,0 +1 @@
+临时文件夹
\ No newline at end of file
diff --git a/adapter/src/test/testng.xml b/adapter/src/test/testng.xml
new file mode 100644
index 000000000000..1fa0f7461a59
--- /dev/null
+++ b/adapter/src/test/testng.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/bridge/bridge.iml b/bridge/bridge.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/bridge/bridge.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/bridge/src/main/java/com/iluwatar/App.java b/bridge/src/main/java/com/iluwatar/bridge/App.java
similarity index 94%
rename from bridge/src/main/java/com/iluwatar/App.java
rename to bridge/src/main/java/com/iluwatar/bridge/App.java
index 800b9815cd0a..a91cc1eaa363 100644
--- a/bridge/src/main/java/com/iluwatar/App.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/App.java
@@ -1,35 +1,35 @@
-package com.iluwatar;
-
-/**
- *
- * In Bridge pattern both abstraction (MagicWeapon)
- * and implementation (MagicWeaponImp) have their
- * own class hierarchies. The interface of the
- * implementations can be changed without affecting
- * the clients.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- BlindingMagicWeapon blindingMagicWeapon = new BlindingMagicWeapon(new Excalibur());
- blindingMagicWeapon.wield();
- blindingMagicWeapon.blind();
- blindingMagicWeapon.swing();
- blindingMagicWeapon.unwield();
-
- FlyingMagicWeapon flyingMagicWeapon = new FlyingMagicWeapon(new Mjollnir());
- flyingMagicWeapon.wield();
- flyingMagicWeapon.fly();
- flyingMagicWeapon.swing();
- flyingMagicWeapon.unwield();
-
- SoulEatingMagicWeapon soulEatingMagicWeapon = new SoulEatingMagicWeapon(new Stormbringer());
- soulEatingMagicWeapon.wield();
- soulEatingMagicWeapon.swing();
- soulEatingMagicWeapon.eatSoul();
- soulEatingMagicWeapon.unwield();
-
- }
-}
+package com.iluwatar.bridge;
+
+/**
+ *
+ * In Bridge pattern both abstraction (MagicWeapon)
+ * and implementation (MagicWeaponImp) have their
+ * own class hierarchies. The interface of the
+ * implementations can be changed without affecting
+ * the clients.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ BlindingMagicWeapon blindingMagicWeapon = new BlindingMagicWeapon(new Excalibur());
+ blindingMagicWeapon.wield();
+ blindingMagicWeapon.blind();
+ blindingMagicWeapon.swing();
+ blindingMagicWeapon.unwield();
+
+ FlyingMagicWeapon flyingMagicWeapon = new FlyingMagicWeapon(new Mjollnir());
+ flyingMagicWeapon.wield();
+ flyingMagicWeapon.fly();
+ flyingMagicWeapon.swing();
+ flyingMagicWeapon.unwield();
+
+ SoulEatingMagicWeapon soulEatingMagicWeapon = new SoulEatingMagicWeapon(new Stormbringer());
+ soulEatingMagicWeapon.wield();
+ soulEatingMagicWeapon.swing();
+ soulEatingMagicWeapon.eatSoul();
+ soulEatingMagicWeapon.unwield();
+
+ }
+}
diff --git a/bridge/src/main/java/com/iluwatar/BlindingMagicWeapon.java b/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeapon.java
similarity index 89%
rename from bridge/src/main/java/com/iluwatar/BlindingMagicWeapon.java
rename to bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeapon.java
index 9e61acfb2bcc..d4d3088876f4 100644
--- a/bridge/src/main/java/com/iluwatar/BlindingMagicWeapon.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeapon.java
@@ -1,33 +1,33 @@
-package com.iluwatar;
-
-public class BlindingMagicWeapon extends MagicWeapon {
-
- public BlindingMagicWeapon(BlindingMagicWeaponImp imp) {
- super(imp);
- }
-
- @Override
- public BlindingMagicWeaponImp getImp() {
- return (BlindingMagicWeaponImp) imp;
- }
-
- @Override
- public void wield() {
- getImp().wieldImp();
- }
-
- @Override
- public void swing() {
- getImp().swingImp();
- }
-
- @Override
- public void unwield() {
- getImp().unwieldImp();
- }
-
- public void blind() {
- getImp().blindImp();
- }
-
-}
+package com.iluwatar.bridge;
+
+public class BlindingMagicWeapon extends MagicWeapon {
+
+ public BlindingMagicWeapon(BlindingMagicWeaponImp imp) {
+ super(imp);
+ }
+
+ @Override
+ public BlindingMagicWeaponImp getImp() {
+ return (BlindingMagicWeaponImp) imp;
+ }
+
+ @Override
+ public void wield() {
+ getImp().wieldImp();
+ }
+
+ @Override
+ public void swing() {
+ getImp().swingImp();
+ }
+
+ @Override
+ public void unwield() {
+ getImp().unwieldImp();
+ }
+
+ public void blind() {
+ getImp().blindImp();
+ }
+
+}
diff --git a/bridge/src/main/java/com/iluwatar/BlindingMagicWeaponImp.java b/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeaponImp.java
similarity index 78%
rename from bridge/src/main/java/com/iluwatar/BlindingMagicWeaponImp.java
rename to bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeaponImp.java
index 5f8cc7bb7dd8..c241dcc43f39 100644
--- a/bridge/src/main/java/com/iluwatar/BlindingMagicWeaponImp.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/BlindingMagicWeaponImp.java
@@ -1,7 +1,7 @@
-package com.iluwatar;
-
-public abstract class BlindingMagicWeaponImp extends MagicWeaponImp {
-
- public abstract void blindImp();
-
-}
+package com.iluwatar.bridge;
+
+public abstract class BlindingMagicWeaponImp extends MagicWeaponImp {
+
+ public abstract void blindImp();
+
+}
diff --git a/bridge/src/main/java/com/iluwatar/Excalibur.java b/bridge/src/main/java/com/iluwatar/bridge/Excalibur.java
similarity index 90%
rename from bridge/src/main/java/com/iluwatar/Excalibur.java
rename to bridge/src/main/java/com/iluwatar/bridge/Excalibur.java
index 83f3e02accc3..0da14c6172a9 100644
--- a/bridge/src/main/java/com/iluwatar/Excalibur.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/Excalibur.java
@@ -1,25 +1,25 @@
-package com.iluwatar;
-
-public class Excalibur extends BlindingMagicWeaponImp {
-
- @Override
- public void wieldImp() {
- System.out.println("wielding Excalibur");
- }
-
- @Override
- public void swingImp() {
- System.out.println("swinging Excalibur");
- }
-
- @Override
- public void unwieldImp() {
- System.out.println("unwielding Excalibur");
- }
-
- @Override
- public void blindImp() {
- System.out.println("bright light streams from Excalibur blinding the enemy");
- }
-
-}
+package com.iluwatar.bridge;
+
+public class Excalibur extends BlindingMagicWeaponImp {
+
+ @Override
+ public void wieldImp() {
+ System.out.println("wielding Excalibur");
+ }
+
+ @Override
+ public void swingImp() {
+ System.out.println("swinging Excalibur");
+ }
+
+ @Override
+ public void unwieldImp() {
+ System.out.println("unwielding Excalibur");
+ }
+
+ @Override
+ public void blindImp() {
+ System.out.println("bright light streams from Excalibur blinding the enemy");
+ }
+
+}
diff --git a/bridge/src/main/java/com/iluwatar/FlyingMagicWeapon.java b/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeapon.java
similarity index 89%
rename from bridge/src/main/java/com/iluwatar/FlyingMagicWeapon.java
rename to bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeapon.java
index 2912cb7fc068..bf7fedf50540 100644
--- a/bridge/src/main/java/com/iluwatar/FlyingMagicWeapon.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeapon.java
@@ -1,32 +1,32 @@
-package com.iluwatar;
-
-public class FlyingMagicWeapon extends MagicWeapon {
-
- public FlyingMagicWeapon(FlyingMagicWeaponImp imp) {
- super(imp);
- }
-
- public FlyingMagicWeaponImp getImp() {
- return (FlyingMagicWeaponImp) imp;
- }
-
- @Override
- public void wield() {
- getImp().wieldImp();
- }
-
- @Override
- public void swing() {
- getImp().swingImp();
- }
-
- @Override
- public void unwield() {
- getImp().unwieldImp();
- }
-
- public void fly() {
- getImp().flyImp();
- }
-
-}
+package com.iluwatar.bridge;
+
+public class FlyingMagicWeapon extends MagicWeapon {
+
+ public FlyingMagicWeapon(FlyingMagicWeaponImp imp) {
+ super(imp);
+ }
+
+ public FlyingMagicWeaponImp getImp() {
+ return (FlyingMagicWeaponImp) imp;
+ }
+
+ @Override
+ public void wield() {
+ getImp().wieldImp();
+ }
+
+ @Override
+ public void swing() {
+ getImp().swingImp();
+ }
+
+ @Override
+ public void unwield() {
+ getImp().unwieldImp();
+ }
+
+ public void fly() {
+ getImp().flyImp();
+ }
+
+}
diff --git a/bridge/src/main/java/com/iluwatar/FlyingMagicWeaponImp.java b/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeaponImp.java
similarity index 78%
rename from bridge/src/main/java/com/iluwatar/FlyingMagicWeaponImp.java
rename to bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeaponImp.java
index 5860f110dd6b..83648f622c83 100644
--- a/bridge/src/main/java/com/iluwatar/FlyingMagicWeaponImp.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/FlyingMagicWeaponImp.java
@@ -1,7 +1,7 @@
-package com.iluwatar;
-
-public abstract class FlyingMagicWeaponImp extends MagicWeaponImp {
-
- public abstract void flyImp();
-
-}
+package com.iluwatar.bridge;
+
+public abstract class FlyingMagicWeaponImp extends MagicWeaponImp {
+
+ public abstract void flyImp();
+
+}
diff --git a/bridge/src/main/java/com/iluwatar/MagicWeapon.java b/bridge/src/main/java/com/iluwatar/bridge/MagicWeapon.java
similarity index 87%
rename from bridge/src/main/java/com/iluwatar/MagicWeapon.java
rename to bridge/src/main/java/com/iluwatar/bridge/MagicWeapon.java
index 0773a09fc921..252f42104550 100644
--- a/bridge/src/main/java/com/iluwatar/MagicWeapon.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/MagicWeapon.java
@@ -1,26 +1,26 @@
-package com.iluwatar;
-
-/**
- *
- * Abstraction interface.
- *
- */
-public abstract class MagicWeapon {
-
- protected MagicWeaponImp imp;
-
- public MagicWeapon(MagicWeaponImp imp) {
- this.imp = imp;
- }
-
- public abstract void wield();
-
- public abstract void swing();
-
- public abstract void unwield();
-
- public MagicWeaponImp getImp() {
- return imp;
- }
-
-}
+package com.iluwatar.bridge;
+
+/**
+ *
+ * Abstraction interface.
+ *
+ */
+public abstract class MagicWeapon {
+
+ protected MagicWeaponImp imp;
+
+ public MagicWeapon(MagicWeaponImp imp) {
+ this.imp = imp;
+ }
+
+ public abstract void wield();
+
+ public abstract void swing();
+
+ public abstract void unwield();
+
+ public MagicWeaponImp getImp() {
+ return imp;
+ }
+
+}
diff --git a/bridge/src/main/java/com/iluwatar/MagicWeaponImp.java b/bridge/src/main/java/com/iluwatar/bridge/MagicWeaponImp.java
similarity index 83%
rename from bridge/src/main/java/com/iluwatar/MagicWeaponImp.java
rename to bridge/src/main/java/com/iluwatar/bridge/MagicWeaponImp.java
index d657e517718d..1ee64f54677a 100644
--- a/bridge/src/main/java/com/iluwatar/MagicWeaponImp.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/MagicWeaponImp.java
@@ -1,16 +1,16 @@
-package com.iluwatar;
-
-/**
- *
- * Implementation interface.
- *
- */
-public abstract class MagicWeaponImp {
-
- public abstract void wieldImp();
-
- public abstract void swingImp();
-
- public abstract void unwieldImp();
-
-}
+package com.iluwatar.bridge;
+
+/**
+ *
+ * Implementation interface.
+ *
+ */
+public abstract class MagicWeaponImp {
+
+ public abstract void wieldImp();
+
+ public abstract void swingImp();
+
+ public abstract void unwieldImp();
+
+}
diff --git a/bridge/src/main/java/com/iluwatar/Mjollnir.java b/bridge/src/main/java/com/iluwatar/bridge/Mjollnir.java
similarity index 90%
rename from bridge/src/main/java/com/iluwatar/Mjollnir.java
rename to bridge/src/main/java/com/iluwatar/bridge/Mjollnir.java
index 4ba68ab6cda7..d0209bdc28ae 100644
--- a/bridge/src/main/java/com/iluwatar/Mjollnir.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/Mjollnir.java
@@ -1,25 +1,25 @@
-package com.iluwatar;
-
-public class Mjollnir extends FlyingMagicWeaponImp {
-
- @Override
- public void wieldImp() {
- System.out.println("wielding Mjollnir");
- }
-
- @Override
- public void swingImp() {
- System.out.println("swinging Mjollnir");
- }
-
- @Override
- public void unwieldImp() {
- System.out.println("unwielding Mjollnir");
- }
-
- @Override
- public void flyImp() {
- System.out.println("Mjollnir hits the enemy in the air and returns back to the owner's hand");
- }
-
-}
+package com.iluwatar.bridge;
+
+public class Mjollnir extends FlyingMagicWeaponImp {
+
+ @Override
+ public void wieldImp() {
+ System.out.println("wielding Mjollnir");
+ }
+
+ @Override
+ public void swingImp() {
+ System.out.println("swinging Mjollnir");
+ }
+
+ @Override
+ public void unwieldImp() {
+ System.out.println("unwielding Mjollnir");
+ }
+
+ @Override
+ public void flyImp() {
+ System.out.println("Mjollnir hits the enemy in the air and returns back to the owner's hand");
+ }
+
+}
diff --git a/bridge/src/main/java/com/iluwatar/SoulEatingMagicWeapon.java b/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeapon.java
similarity index 89%
rename from bridge/src/main/java/com/iluwatar/SoulEatingMagicWeapon.java
rename to bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeapon.java
index 20e55294e0f2..6d8b553ba05d 100644
--- a/bridge/src/main/java/com/iluwatar/SoulEatingMagicWeapon.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeapon.java
@@ -1,33 +1,33 @@
-package com.iluwatar;
-
-public class SoulEatingMagicWeapon extends MagicWeapon {
-
- public SoulEatingMagicWeapon(SoulEatingMagicWeaponImp imp) {
- super(imp);
- }
-
- @Override
- public SoulEatingMagicWeaponImp getImp() {
- return (SoulEatingMagicWeaponImp) imp;
- }
-
- @Override
- public void wield() {
- getImp().wieldImp();
- }
-
- @Override
- public void swing() {
- getImp().swingImp();
- }
-
- @Override
- public void unwield() {
- getImp().unwieldImp();
- }
-
- public void eatSoul() {
- getImp().eatSoulImp();
- }
-
-}
+package com.iluwatar.bridge;
+
+public class SoulEatingMagicWeapon extends MagicWeapon {
+
+ public SoulEatingMagicWeapon(SoulEatingMagicWeaponImp imp) {
+ super(imp);
+ }
+
+ @Override
+ public SoulEatingMagicWeaponImp getImp() {
+ return (SoulEatingMagicWeaponImp) imp;
+ }
+
+ @Override
+ public void wield() {
+ getImp().wieldImp();
+ }
+
+ @Override
+ public void swing() {
+ getImp().swingImp();
+ }
+
+ @Override
+ public void unwield() {
+ getImp().unwieldImp();
+ }
+
+ public void eatSoul() {
+ getImp().eatSoulImp();
+ }
+
+}
diff --git a/bridge/src/main/java/com/iluwatar/SoulEatingMagicWeaponImp.java b/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeaponImp.java
similarity index 79%
rename from bridge/src/main/java/com/iluwatar/SoulEatingMagicWeaponImp.java
rename to bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeaponImp.java
index 761a1a8749ae..5549ebecb414 100644
--- a/bridge/src/main/java/com/iluwatar/SoulEatingMagicWeaponImp.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/SoulEatingMagicWeaponImp.java
@@ -1,7 +1,7 @@
-package com.iluwatar;
-
-public abstract class SoulEatingMagicWeaponImp extends MagicWeaponImp {
-
- public abstract void eatSoulImp();
-
-}
+package com.iluwatar.bridge;
+
+public abstract class SoulEatingMagicWeaponImp extends MagicWeaponImp {
+
+ public abstract void eatSoulImp();
+
+}
diff --git a/bridge/src/main/java/com/iluwatar/Stormbringer.java b/bridge/src/main/java/com/iluwatar/bridge/Stormbringer.java
similarity index 90%
rename from bridge/src/main/java/com/iluwatar/Stormbringer.java
rename to bridge/src/main/java/com/iluwatar/bridge/Stormbringer.java
index 673ed99a7218..6e41ae0f33c1 100644
--- a/bridge/src/main/java/com/iluwatar/Stormbringer.java
+++ b/bridge/src/main/java/com/iluwatar/bridge/Stormbringer.java
@@ -1,25 +1,25 @@
-package com.iluwatar;
-
-public class Stormbringer extends SoulEatingMagicWeaponImp {
-
- @Override
- public void wieldImp() {
- System.out.println("wielding Stormbringer");
- }
-
- @Override
- public void swingImp() {
- System.out.println("swinging Stormbringer");
- }
-
- @Override
- public void unwieldImp() {
- System.out.println("unwielding Stormbringer");
- }
-
- @Override
- public void eatSoulImp() {
- System.out.println("Stormbringer devours the enemy's soul");
- }
-
-}
+package com.iluwatar.bridge;
+
+public class Stormbringer extends SoulEatingMagicWeaponImp {
+
+ @Override
+ public void wieldImp() {
+ System.out.println("wielding Stormbringer");
+ }
+
+ @Override
+ public void swingImp() {
+ System.out.println("swinging Stormbringer");
+ }
+
+ @Override
+ public void unwieldImp() {
+ System.out.println("unwielding Stormbringer");
+ }
+
+ @Override
+ public void eatSoulImp() {
+ System.out.println("Stormbringer devours the enemy's soul");
+ }
+
+}
diff --git a/builder/.gitignore b/builder/.gitignore
index b83d22266ac8..e2540458518e 100644
--- a/builder/.gitignore
+++ b/builder/.gitignore
@@ -1 +1,2 @@
/target/
+/bin
diff --git a/builder/builder.iml b/builder/builder.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/builder/builder.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/builder/src/main/java/com/iluwatar/App.java b/builder/src/main/java/com/iluwatar/builder/App.java
similarity index 56%
rename from builder/src/main/java/com/iluwatar/App.java
rename to builder/src/main/java/com/iluwatar/builder/App.java
index 1eea20c10e08..0d8f587adf0d 100644
--- a/builder/src/main/java/com/iluwatar/App.java
+++ b/builder/src/main/java/com/iluwatar/builder/App.java
@@ -1,47 +1,49 @@
-package com.iluwatar;
-
-import com.iluwatar.Hero.HeroBuilder;
-
-/**
- *
- * This is the Builder pattern variation as described by
- * Joshua Bloch in Effective Java 2nd Edition.
- *
- * We want to build Hero objects, but its construction
- * is complex because of the many parameters needed. To
- * aid the user we introduce HeroBuilder class. HeroBuilder
- * takes the minimum parameters to build Hero object in
- * its constructor. After that additional configuration
- * for the Hero object can be done using the fluent
- * HeroBuilder interface. When configuration is ready
- * the build method is called to receive the final Hero
- * object.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
-
- Hero mage = new HeroBuilder(Profession.MAGE, "Riobard")
- .withHairColor(HairColor.BLACK)
- .withWeapon(Weapon.DAGGER)
- .build();
- System.out.println(mage);
-
- Hero warrior = new HeroBuilder(Profession.WARRIOR, "Amberjill")
- .withHairColor(HairColor.BLOND)
- .withHairType(HairType.LONG_CURLY)
- .withArmor(Armor.CHAIN_MAIL)
- .withWeapon(Weapon.SWORD)
- .build();
- System.out.println(warrior);
-
- Hero thief = new HeroBuilder(Profession.THIEF, "Desmond")
- .withHairType(HairType.BOLD)
- .withWeapon(Weapon.BOW)
- .build();
- System.out.println(thief);
-
- }
-}
+package com.iluwatar.builder;
+
+import com.iluwatar.builder.Hero.HeroBuilder;
+
+
+
+/**
+ *
+ * This is the Builder pattern variation as described by
+ * Joshua Bloch in Effective Java 2nd Edition.
+ *
+ * We want to build Hero objects, but its construction
+ * is complex because of the many parameters needed. To
+ * aid the user we introduce HeroBuilder class. HeroBuilder
+ * takes the minimum parameters to build Hero object in
+ * its constructor. After that additional configuration
+ * for the Hero object can be done using the fluent
+ * HeroBuilder interface. When configuration is ready
+ * the build method is called to receive the final Hero
+ * object.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+
+ Hero mage = new HeroBuilder(Profession.MAGE, "Riobard")
+ .withHairColor(HairColor.BLACK)
+ .withWeapon(Weapon.DAGGER)
+ .build();
+ System.out.println(mage);
+
+ Hero warrior = new HeroBuilder(Profession.WARRIOR, "Amberjill")
+ .withHairColor(HairColor.BLOND)
+ .withHairType(HairType.LONG_CURLY)
+ .withArmor(Armor.CHAIN_MAIL)
+ .withWeapon(Weapon.SWORD)
+ .build();
+ System.out.println(warrior);
+
+ Hero thief = new HeroBuilder(Profession.THIEF, "Desmond")
+ .withHairType(HairType.BOLD)
+ .withWeapon(Weapon.BOW)
+ .build();
+ System.out.println(thief);
+
+ }
+}
diff --git a/builder/src/main/java/com/iluwatar/Armor.java b/builder/src/main/java/com/iluwatar/builder/Armor.java
similarity index 89%
rename from builder/src/main/java/com/iluwatar/Armor.java
rename to builder/src/main/java/com/iluwatar/builder/Armor.java
index 0c7c753b2424..a3f4d289dd32 100644
--- a/builder/src/main/java/com/iluwatar/Armor.java
+++ b/builder/src/main/java/com/iluwatar/builder/Armor.java
@@ -1,19 +1,19 @@
-package com.iluwatar;
-
-public enum Armor {
-
- CLOTHES, LEATHER, CHAIN_MAIL, PLATE_MAIL;
-
- @Override
- public String toString() {
- String s = "";
- switch(this) {
- case CLOTHES: s = "clothes"; break;
- case LEATHER: s = "leather armor"; break;
- case CHAIN_MAIL: s = "chain mail"; break;
- case PLATE_MAIL: s = "plate mail"; break;
- }
- return s;
- }
-
-}
+package com.iluwatar.builder;
+
+public enum Armor {
+
+ CLOTHES, LEATHER, CHAIN_MAIL, PLATE_MAIL;
+
+ @Override
+ public String toString() {
+ String s = "";
+ switch(this) {
+ case CLOTHES: s = "clothes"; break;
+ case LEATHER: s = "leather armor"; break;
+ case CHAIN_MAIL: s = "chain mail"; break;
+ case PLATE_MAIL: s = "plate mail"; break;
+ }
+ return s;
+ }
+
+}
diff --git a/builder/src/main/java/com/iluwatar/HairColor.java b/builder/src/main/java/com/iluwatar/builder/HairColor.java
similarity index 88%
rename from builder/src/main/java/com/iluwatar/HairColor.java
rename to builder/src/main/java/com/iluwatar/builder/HairColor.java
index ffac28906872..16d74db207ca 100644
--- a/builder/src/main/java/com/iluwatar/HairColor.java
+++ b/builder/src/main/java/com/iluwatar/builder/HairColor.java
@@ -1,20 +1,20 @@
-package com.iluwatar;
-
-public enum HairColor {
-
- WHITE, BLOND, RED, BROWN, BLACK;
-
- @Override
- public String toString() {
- String s = "";
- switch(this) {
- case WHITE: s = "white"; break;
- case BLOND: s = "blond"; break;
- case RED: s = "red"; break;
- case BROWN: s = "brown"; break;
- case BLACK: s = "black"; break;
- }
- return s;
- }
-
-}
+package com.iluwatar.builder;
+
+public enum HairColor {
+
+ WHITE, BLOND, RED, BROWN, BLACK;
+
+ @Override
+ public String toString() {
+ String s = "";
+ switch(this) {
+ case WHITE: s = "white"; break;
+ case BLOND: s = "blond"; break;
+ case RED: s = "red"; break;
+ case BROWN: s = "brown"; break;
+ case BLACK: s = "black"; break;
+ }
+ return s;
+ }
+
+}
diff --git a/builder/src/main/java/com/iluwatar/HairType.java b/builder/src/main/java/com/iluwatar/builder/HairType.java
similarity index 89%
rename from builder/src/main/java/com/iluwatar/HairType.java
rename to builder/src/main/java/com/iluwatar/builder/HairType.java
index 9766b29e27c3..8d28683ff23e 100644
--- a/builder/src/main/java/com/iluwatar/HairType.java
+++ b/builder/src/main/java/com/iluwatar/builder/HairType.java
@@ -1,20 +1,20 @@
-package com.iluwatar;
-
-public enum HairType {
-
- BOLD, SHORT, CURLY, LONG_STRAIGHT, LONG_CURLY;
-
- @Override
- public String toString() {
- String s = "";
- switch(this) {
- case BOLD: s = "bold"; break;
- case SHORT: s = "short"; break;
- case CURLY: s = "curly"; break;
- case LONG_STRAIGHT: s = "long straight"; break;
- case LONG_CURLY: s = "long curly"; break;
- }
- return s;
- }
-
-}
+package com.iluwatar.builder;
+
+public enum HairType {
+
+ BOLD, SHORT, CURLY, LONG_STRAIGHT, LONG_CURLY;
+
+ @Override
+ public String toString() {
+ String s = "";
+ switch(this) {
+ case BOLD: s = "bold"; break;
+ case SHORT: s = "short"; break;
+ case CURLY: s = "curly"; break;
+ case LONG_STRAIGHT: s = "long straight"; break;
+ case LONG_CURLY: s = "long curly"; break;
+ }
+ return s;
+ }
+
+}
diff --git a/builder/src/main/java/com/iluwatar/Hero.java b/builder/src/main/java/com/iluwatar/builder/Hero.java
similarity index 85%
rename from builder/src/main/java/com/iluwatar/Hero.java
rename to builder/src/main/java/com/iluwatar/builder/Hero.java
index e728fab7a99b..19239d07956a 100644
--- a/builder/src/main/java/com/iluwatar/Hero.java
+++ b/builder/src/main/java/com/iluwatar/builder/Hero.java
@@ -1,127 +1,128 @@
-package com.iluwatar;
-
-/**
- *
- * The class with many parameters.
- *
- */
-public class Hero {
-
- private final Profession profession;
- private final String name;
- private final HairType hairType;
- private final HairColor hairColor;
- private final Armor armor;
- private final Weapon weapon;
-
- public Profession getProfession() {
- return profession;
- }
-
- public String getName() {
- return name;
- }
-
- public HairType getHairType() {
- return hairType;
- }
-
- public HairColor getHairColor() {
- return hairColor;
- }
-
- public Armor getArmor() {
- return armor;
- }
-
- public Weapon getWeapon() {
- return weapon;
- }
-
- @Override
- public String toString() {
-
- StringBuilder sb = new StringBuilder();
- sb.append(profession);
- sb.append(" named ");
- sb.append(name);
- if (hairColor != null || hairType != null) {
- sb.append(" with ");
- if (hairColor != null) {
- sb.append(hairColor);
- sb.append(" ");
- }
- if (hairType != null) {
- sb.append(hairType);
- sb.append(" ");
- }
- sb.append(hairType != HairType.BOLD ? "hair" : "head");
- }
- if (armor != null) {
- sb.append(" wearing ");
- sb.append(armor);
- }
- if (weapon != null) {
- sb.append(" and wielding ");
- sb.append(weapon);
- }
- sb.append(".");
- return sb.toString();
- }
-
- private Hero(HeroBuilder builder) {
- this.profession = builder.profession;
- this.name = builder.name;
- this.hairColor = builder.hairColor;
- this.hairType = builder.hairType;
- this.weapon = builder.weapon;
- this.armor = builder.armor;
- }
-
- /**
- *
- * The builder class.
- *
- */
- public static class HeroBuilder {
-
- private final Profession profession;
- private final String name;
- private HairType hairType;
- private HairColor hairColor;
- private Armor armor;
- private Weapon weapon;
-
- public HeroBuilder(Profession profession, String name) {
- if (profession == null || name == null) {
- throw new NullPointerException("profession and name can not be null");
- }
- this.profession = profession;
- this.name = name;
- }
-
- public HeroBuilder withHairType(HairType hairType) {
- this.hairType = hairType;
- return this;
- }
-
- public HeroBuilder withHairColor(HairColor hairColor) {
- this.hairColor = hairColor;
- return this;
- }
-
- public HeroBuilder withArmor(Armor armor) {
- this.armor = armor;
- return this;
- }
-
- public HeroBuilder withWeapon(Weapon weapon) {
- this.weapon = weapon;
- return this;
- }
-
- public Hero build() {
- return new Hero(this);
- }
- }
-}
+package com.iluwatar.builder;
+
+
+/**
+ *
+ * The class with many parameters.
+ *
+ */
+public class Hero {
+
+ private final Profession profession;
+ private final String name;
+ private final HairType hairType;
+ private final HairColor hairColor;
+ private final Armor armor;
+ private final Weapon weapon;
+
+ public Profession getProfession() {
+ return profession;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public HairType getHairType() {
+ return hairType;
+ }
+
+ public HairColor getHairColor() {
+ return hairColor;
+ }
+
+ public Armor getArmor() {
+ return armor;
+ }
+
+ public Weapon getWeapon() {
+ return weapon;
+ }
+
+ @Override
+ public String toString() {
+
+ StringBuilder sb = new StringBuilder();
+ sb.append(profession);
+ sb.append(" named ");
+ sb.append(name);
+ if (hairColor != null || hairType != null) {
+ sb.append(" with ");
+ if (hairColor != null) {
+ sb.append(hairColor);
+ sb.append(" ");
+ }
+ if (hairType != null) {
+ sb.append(hairType);
+ sb.append(" ");
+ }
+ sb.append(hairType != HairType.BOLD ? "hair" : "head");
+ }
+ if (armor != null) {
+ sb.append(" wearing ");
+ sb.append(armor);
+ }
+ if (weapon != null) {
+ sb.append(" and wielding ");
+ sb.append(weapon);
+ }
+ sb.append(".");
+ return sb.toString();
+ }
+
+ private Hero(HeroBuilder builder) {
+ profession = builder.profession;
+ name = builder.name;
+ hairColor = builder.hairColor;
+ hairType = builder.hairType;
+ weapon = builder.weapon;
+ armor = builder.armor;
+ }
+
+ /**
+ *
+ * The builder class.
+ *
+ */
+ public static class HeroBuilder {
+
+ private final Profession profession;
+ private final String name;
+ private HairType hairType;
+ private HairColor hairColor;
+ private Armor armor;
+ private Weapon weapon;
+
+ public HeroBuilder(Profession profession, String name) {
+ if (profession == null || name == null) {
+ throw new NullPointerException("profession and name can not be null");
+ }
+ this.profession = profession;
+ this.name = name;
+ }
+
+ public HeroBuilder withHairType(HairType hairType) {
+ this.hairType = hairType;
+ return this;
+ }
+
+ public HeroBuilder withHairColor(HairColor hairColor) {
+ this.hairColor = hairColor;
+ return this;
+ }
+
+ public HeroBuilder withArmor(Armor armor) {
+ this.armor = armor;
+ return this;
+ }
+
+ public HeroBuilder withWeapon(Weapon weapon) {
+ this.weapon = weapon;
+ return this;
+ }
+
+ public Hero build() {
+ return new Hero(this);
+ }
+ }
+}
diff --git a/builder/src/main/java/com/iluwatar/Profession.java b/builder/src/main/java/com/iluwatar/builder/Profession.java
similarity index 87%
rename from builder/src/main/java/com/iluwatar/Profession.java
rename to builder/src/main/java/com/iluwatar/builder/Profession.java
index a0e02a994e86..27de558d46e5 100644
--- a/builder/src/main/java/com/iluwatar/Profession.java
+++ b/builder/src/main/java/com/iluwatar/builder/Profession.java
@@ -1,19 +1,19 @@
-package com.iluwatar;
-
-public enum Profession {
-
- WARRIOR, THIEF, MAGE, PRIEST;
-
- @Override
- public String toString() {
- String s = "";
- switch(this) {
- case WARRIOR: s = "Warrior"; break;
- case THIEF: s = "Thief"; break;
- case MAGE: s = "Mage"; break;
- case PRIEST: s = "Priest"; break;
- }
- return s;
- }
-
-}
+package com.iluwatar.builder;
+
+public enum Profession {
+
+ WARRIOR, THIEF, MAGE, PRIEST;
+
+ @Override
+ public String toString() {
+ String s = "";
+ switch(this) {
+ case WARRIOR: s = "Warrior"; break;
+ case THIEF: s = "Thief"; break;
+ case MAGE: s = "Mage"; break;
+ case PRIEST: s = "Priest"; break;
+ }
+ return s;
+ }
+
+}
diff --git a/builder/src/main/java/com/iluwatar/Weapon.java b/builder/src/main/java/com/iluwatar/builder/Weapon.java
similarity index 88%
rename from builder/src/main/java/com/iluwatar/Weapon.java
rename to builder/src/main/java/com/iluwatar/builder/Weapon.java
index b48977b50154..6efa21ca6319 100644
--- a/builder/src/main/java/com/iluwatar/Weapon.java
+++ b/builder/src/main/java/com/iluwatar/builder/Weapon.java
@@ -1,20 +1,20 @@
-package com.iluwatar;
-
-public enum Weapon {
-
- DAGGER, SWORD, AXE, WARHAMMER, BOW;
-
- @Override
- public String toString() {
- String s = "";
- switch(this) {
- case DAGGER: s = "dagger"; break;
- case SWORD: s = "sword"; break;
- case AXE: s = "axe"; break;
- case WARHAMMER: s = "warhammer"; break;
- case BOW: s = "bow"; break;
- }
- return s;
- }
-
-}
+package com.iluwatar.builder;
+
+public enum Weapon {
+
+ DAGGER, SWORD, AXE, WARHAMMER, BOW;
+
+ @Override
+ public String toString() {
+ String s = "";
+ switch(this) {
+ case DAGGER: s = "dagger"; break;
+ case SWORD: s = "sword"; break;
+ case AXE: s = "axe"; break;
+ case WARHAMMER: s = "warhammer"; break;
+ case BOW: s = "bow"; break;
+ }
+ return s;
+ }
+
+}
diff --git a/chain/chain.iml b/chain/chain.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/chain/chain.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/chain/src/main/java/com/iluwatar/App.java b/chain/src/main/java/com/iluwatar/App.java
deleted file mode 100644
index 92b85b54d0da..000000000000
--- a/chain/src/main/java/com/iluwatar/App.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.iluwatar;
-
-/**
- *
- * Chain of Responsibility organizes request handlers (RequestHandler) into
- * a chain where each handler has a chance to act on the request on its
- * turn. In this example the king (OrcKing) makes requests and the military
- * orcs (OrcCommander, OrcOfficer, OrcSoldier) form the handler chain.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
-
- OrcKing king = new OrcKing();
- king.makeRequest(new Request(RequestType.DEFEND_CASTLE, "defend castle"));
- king.makeRequest(new Request(RequestType.TORTURE_PRISONER, "torture prisoner"));
- king.makeRequest(new Request(RequestType.COLLECT_TAX, "collect tax"));
-
- }
-}
diff --git a/chain/src/main/java/com/iluwatar/chain/App.java b/chain/src/main/java/com/iluwatar/chain/App.java
new file mode 100644
index 000000000000..2b846f9314ed
--- /dev/null
+++ b/chain/src/main/java/com/iluwatar/chain/App.java
@@ -0,0 +1,23 @@
+package com.iluwatar.chain;
+
+
+/**
+ *
+ * Chain of Responsibility organizes request handlers (RequestHandler) into
+ * a chain where each handler has a chance to act on the request on its
+ * turn. In this example the king (OrcKing) makes requests and the military
+ * orcs (OrcCommander, OrcOfficer, OrcSoldier) form the handler chain.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+
+ OrcKing king = new OrcKing();
+ king.makeRequest(new Request(RequestType.DEFEND_CASTLE, "defend castle"));
+ king.makeRequest(new Request(RequestType.TORTURE_PRISONER, "torture prisoner"));
+ king.makeRequest(new Request(RequestType.COLLECT_TAX, "collect tax"));
+
+ }
+}
diff --git a/chain/src/main/java/com/iluwatar/OrcCommander.java b/chain/src/main/java/com/iluwatar/chain/OrcCommander.java
similarity index 89%
rename from chain/src/main/java/com/iluwatar/OrcCommander.java
rename to chain/src/main/java/com/iluwatar/chain/OrcCommander.java
index dc0c403d047e..6407c09f6a6b 100644
--- a/chain/src/main/java/com/iluwatar/OrcCommander.java
+++ b/chain/src/main/java/com/iluwatar/chain/OrcCommander.java
@@ -1,22 +1,22 @@
-package com.iluwatar;
-
-public class OrcCommander extends RequestHandler {
-
- public OrcCommander(RequestHandler handler) {
- super(handler);
- }
-
- @Override
- public void handleRequest(Request req) {
- if (req.getRequestType().equals(RequestType.DEFEND_CASTLE)) {
- printHandling(req);
- } else {
- super.handleRequest(req);
- }
- }
-
- @Override
- public String toString() {
- return "Orc commander";
- }
-}
+package com.iluwatar.chain;
+
+public class OrcCommander extends RequestHandler {
+
+ public OrcCommander(RequestHandler handler) {
+ super(handler);
+ }
+
+ @Override
+ public void handleRequest(Request req) {
+ if (req.getRequestType().equals(RequestType.DEFEND_CASTLE)) {
+ printHandling(req);
+ } else {
+ super.handleRequest(req);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "Orc commander";
+ }
+}
diff --git a/chain/src/main/java/com/iluwatar/OrcKing.java b/chain/src/main/java/com/iluwatar/chain/OrcKing.java
similarity index 87%
rename from chain/src/main/java/com/iluwatar/OrcKing.java
rename to chain/src/main/java/com/iluwatar/chain/OrcKing.java
index dc70494ef39c..5feff1796868 100644
--- a/chain/src/main/java/com/iluwatar/OrcKing.java
+++ b/chain/src/main/java/com/iluwatar/chain/OrcKing.java
@@ -1,24 +1,24 @@
-package com.iluwatar;
-
-/**
- *
- * Makes requests that are handled by the chain.
- *
- */
-public class OrcKing {
-
- RequestHandler chain;
-
- public OrcKing() {
- buildChain();
- }
-
- private void buildChain() {
- chain = new OrcCommander(new OrcOfficer(new OrcSoldier(null)));
- }
-
- public void makeRequest(Request req) {
- chain.handleRequest(req);
- }
-
-}
+package com.iluwatar.chain;
+
+/**
+ *
+ * Makes requests that are handled by the chain.
+ *
+ */
+public class OrcKing {
+
+ RequestHandler chain;
+
+ public OrcKing() {
+ buildChain();
+ }
+
+ private void buildChain() {
+ chain = new OrcCommander(new OrcOfficer(new OrcSoldier(null)));
+ }
+
+ public void makeRequest(Request req) {
+ chain.handleRequest(req);
+ }
+
+}
diff --git a/chain/src/main/java/com/iluwatar/OrcOfficer.java b/chain/src/main/java/com/iluwatar/chain/OrcOfficer.java
similarity index 89%
rename from chain/src/main/java/com/iluwatar/OrcOfficer.java
rename to chain/src/main/java/com/iluwatar/chain/OrcOfficer.java
index dfe414182502..4e3b618c5c84 100644
--- a/chain/src/main/java/com/iluwatar/OrcOfficer.java
+++ b/chain/src/main/java/com/iluwatar/chain/OrcOfficer.java
@@ -1,23 +1,23 @@
-package com.iluwatar;
-
-public class OrcOfficer extends RequestHandler {
-
- public OrcOfficer(RequestHandler handler) {
- super(handler);
- }
-
- @Override
- public void handleRequest(Request req) {
- if (req.getRequestType().equals(RequestType.TORTURE_PRISONER)) {
- printHandling(req);
- } else {
- super.handleRequest(req);
- }
- }
-
- @Override
- public String toString() {
- return "Orc officer";
- }
-
-}
+package com.iluwatar.chain;
+
+public class OrcOfficer extends RequestHandler {
+
+ public OrcOfficer(RequestHandler handler) {
+ super(handler);
+ }
+
+ @Override
+ public void handleRequest(Request req) {
+ if (req.getRequestType().equals(RequestType.TORTURE_PRISONER)) {
+ printHandling(req);
+ } else {
+ super.handleRequest(req);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "Orc officer";
+ }
+
+}
diff --git a/chain/src/main/java/com/iluwatar/OrcSoldier.java b/chain/src/main/java/com/iluwatar/chain/OrcSoldier.java
similarity index 89%
rename from chain/src/main/java/com/iluwatar/OrcSoldier.java
rename to chain/src/main/java/com/iluwatar/chain/OrcSoldier.java
index 0e5a5a603477..294888f9b4e4 100644
--- a/chain/src/main/java/com/iluwatar/OrcSoldier.java
+++ b/chain/src/main/java/com/iluwatar/chain/OrcSoldier.java
@@ -1,22 +1,22 @@
-package com.iluwatar;
-
-public class OrcSoldier extends RequestHandler {
-
- public OrcSoldier(RequestHandler handler) {
- super(handler);
- }
-
- @Override
- public void handleRequest(Request req) {
- if (req.getRequestType().equals(RequestType.COLLECT_TAX)) {
- printHandling(req);
- } else {
- super.handleRequest(req);
- }
- }
-
- @Override
- public String toString() {
- return "Orc soldier";
- }
-}
+package com.iluwatar.chain;
+
+public class OrcSoldier extends RequestHandler {
+
+ public OrcSoldier(RequestHandler handler) {
+ super(handler);
+ }
+
+ @Override
+ public void handleRequest(Request req) {
+ if (req.getRequestType().equals(RequestType.COLLECT_TAX)) {
+ printHandling(req);
+ } else {
+ super.handleRequest(req);
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "Orc soldier";
+ }
+}
diff --git a/chain/src/main/java/com/iluwatar/Request.java b/chain/src/main/java/com/iluwatar/chain/Request.java
similarity index 92%
rename from chain/src/main/java/com/iluwatar/Request.java
rename to chain/src/main/java/com/iluwatar/chain/Request.java
index 00cd239723d1..14ecd08a4d16 100644
--- a/chain/src/main/java/com/iluwatar/Request.java
+++ b/chain/src/main/java/com/iluwatar/chain/Request.java
@@ -1,33 +1,33 @@
-package com.iluwatar;
-
-public class Request {
-
- private String requestDescription;
- private RequestType requestType;
-
- public Request(RequestType requestType, String requestDescription) {
- this.setRequestType(requestType);
- this.setRequestDescription(requestDescription);
- }
-
- public String getRequestDescription() {
- return requestDescription;
- }
-
- public void setRequestDescription(String requestDescription) {
- this.requestDescription = requestDescription;
- }
-
- public RequestType getRequestType() {
- return requestType;
- }
-
- public void setRequestType(RequestType requestType) {
- this.requestType = requestType;
- }
-
- @Override
- public String toString() {
- return getRequestDescription();
- }
-}
+package com.iluwatar.chain;
+
+public class Request {
+
+ private String requestDescription;
+ private RequestType requestType;
+
+ public Request(RequestType requestType, String requestDescription) {
+ this.setRequestType(requestType);
+ this.setRequestDescription(requestDescription);
+ }
+
+ public String getRequestDescription() {
+ return requestDescription;
+ }
+
+ public void setRequestDescription(String requestDescription) {
+ this.requestDescription = requestDescription;
+ }
+
+ public RequestType getRequestType() {
+ return requestType;
+ }
+
+ public void setRequestType(RequestType requestType) {
+ this.requestType = requestType;
+ }
+
+ @Override
+ public String toString() {
+ return getRequestDescription();
+ }
+}
diff --git a/chain/src/main/java/com/iluwatar/RequestHandler.java b/chain/src/main/java/com/iluwatar/chain/RequestHandler.java
similarity index 90%
rename from chain/src/main/java/com/iluwatar/RequestHandler.java
rename to chain/src/main/java/com/iluwatar/chain/RequestHandler.java
index 2eb5176c0ae4..ad7386edc5cf 100644
--- a/chain/src/main/java/com/iluwatar/RequestHandler.java
+++ b/chain/src/main/java/com/iluwatar/chain/RequestHandler.java
@@ -1,23 +1,23 @@
-package com.iluwatar;
-
-public abstract class RequestHandler {
-
- private RequestHandler next;
-
- public RequestHandler(RequestHandler next) {
- this.next = next;
- }
-
- public void handleRequest(Request req) {
- if (next != null) {
- next.handleRequest(req);
- }
- }
-
- protected void printHandling(Request req) {
- System.out.println(this + " handling request \"" + req + "\"");
- }
-
- @Override
- public abstract String toString();
-}
+package com.iluwatar.chain;
+
+public abstract class RequestHandler {
+
+ private RequestHandler next;
+
+ public RequestHandler(RequestHandler next) {
+ this.next = next;
+ }
+
+ public void handleRequest(Request req) {
+ if (next != null) {
+ next.handleRequest(req);
+ }
+ }
+
+ protected void printHandling(Request req) {
+ System.out.println(this + " handling request \"" + req + "\"");
+ }
+
+ @Override
+ public abstract String toString();
+}
diff --git a/chain/src/main/java/com/iluwatar/RequestType.java b/chain/src/main/java/com/iluwatar/chain/RequestType.java
similarity index 72%
rename from chain/src/main/java/com/iluwatar/RequestType.java
rename to chain/src/main/java/com/iluwatar/chain/RequestType.java
index 9f896a54d542..16bbe1ade19a 100644
--- a/chain/src/main/java/com/iluwatar/RequestType.java
+++ b/chain/src/main/java/com/iluwatar/chain/RequestType.java
@@ -1,9 +1,9 @@
-package com.iluwatar;
-
-public enum RequestType {
-
- DEFEND_CASTLE,
- TORTURE_PRISONER,
- COLLECT_TAX
-
-}
+package com.iluwatar.chain;
+
+public enum RequestType {
+
+ DEFEND_CASTLE,
+ TORTURE_PRISONER,
+ COLLECT_TAX
+
+}
diff --git a/command/.gitignore b/command/.gitignore
new file mode 100644
index 000000000000..5e56e040ec09
--- /dev/null
+++ b/command/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/command/command.iml b/command/command.iml
new file mode 100644
index 000000000000..57a0548ee6df
--- /dev/null
+++ b/command/command.iml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/command/out/.gitignore b/command/out/.gitignore
new file mode 100644
index 000000000000..5e56e040ec09
--- /dev/null
+++ b/command/out/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/command/src/main/java/com/iluwatar/App.java b/command/src/main/java/com/iluwatar/App.java
index 0648f8f41620..c0eb867e8a4b 100644
--- a/command/src/main/java/com/iluwatar/App.java
+++ b/command/src/main/java/com/iluwatar/App.java
@@ -1,27 +1,29 @@
-package com.iluwatar;
-
-/**
- *
- * In Command pattern actions are objects that can
- * be executed and undone. The commands in this example
- * are spells cast by the wizard on the goblin.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- Wizard wizard = new Wizard();
- Goblin goblin = new Goblin();
-
- goblin.printStatus();
-
- wizard.castSpell(new ShrinkSpell(), goblin);
- goblin.printStatus();
-
- wizard.castSpell(new InvisibilitySpell(), goblin);
- goblin.printStatus();
- wizard.undoLastSpell();
- goblin.printStatus();
- }
-}
+package com.iluwatar;
+
+
+
+/**
+ *
+ * In Command pattern actions are objects that can
+ * be executed and undone. The commands in this example
+ * are spells cast by the wizard on the goblin.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ Wizard wizard = new Wizard();
+ Goblin goblin = new Goblin();
+
+ goblin.printStatus();
+
+ wizard.castSpell(new ShrinkSpell(), goblin);
+ goblin.printStatus();
+
+ wizard.castSpell(new InvisibilitySpell(), goblin);
+ goblin.printStatus();
+ wizard.undoLastSpell();
+ goblin.printStatus();
+ }
+}
diff --git a/command/src/test/log4j.xml b/command/src/test/log4j.xml
new file mode 100644
index 000000000000..748d0c1a5271
--- /dev/null
+++ b/command/src/test/log4j.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/command/src/test/resources/configure/UATApplicationContext.xml b/command/src/test/resources/configure/UATApplicationContext.xml
new file mode 100644
index 000000000000..818ef52f909e
--- /dev/null
+++ b/command/src/test/resources/configure/UATApplicationContext.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/command/src/test/resources/configure/prop.xml b/command/src/test/resources/configure/prop.xml
new file mode 100644
index 000000000000..c7afbd60d256
--- /dev/null
+++ b/command/src/test/resources/configure/prop.xml
@@ -0,0 +1,133 @@
+
+
+ false
+
+
+ $JAVA_HOME
+ server
+ -server -Xmx768m -XX:PermSize=128m -XX:MaxPermSize=256m -Duser.timezone=GMT+8 -Djava.awt.headless=true
+ 8005
+
+ 80
+
+
+
+ true
+
+ StartTomcat
+ nc.bs.tomcat.startup.BootStrapTomcatService
+ 15
+ true
+ false
+ start|stop
+
+
+ EJB_SERVICE
+ nc.bs.mw.naming.EJBContainerService
+ 15
+ true
+ false
+ start|stop
+
+ nc.bs.mw.tran.IerpTransactionManagerProxy
+ nc.bs.mw.tran.IerpUserTransaction
+ nc.bs.mw.tran.IerpTransactionManager
+ nc.bs.mw.sql.UFSqlObject
+ nc.bs.mw.ejbsql.IerpXADataSource
+
+ design
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ baptest807
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ bafi
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ bafi
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ iufo6103312
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ iufo6103312
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ batm
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ batm
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ bap8
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ bap8
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ foodmart
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ foodmart
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
\ No newline at end of file
diff --git a/command/src/test/resources/configure/test_data_source.xml b/command/src/test/resources/configure/test_data_source.xml
new file mode 100644
index 000000000000..2e45d5ee869c
--- /dev/null
+++ b/command/src/test/resources/configure/test_data_source.xml
@@ -0,0 +1,19 @@
+
+
+
+ design
+ Z
+ jdbc:sqlserver://uapxt02:1433;database=newwf_1010;sendStringParametersAsUnicode=false;responseBuffering=adaptive
+ sa
+ sasasa
+ com.microsoft.sqlserver.jdbc.SQLServerDriver
+ SQLSERVER2008
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
\ No newline at end of file
diff --git a/command/src/test/resources/configure/uat.properties b/command/src/test/resources/configure/uat.properties
new file mode 100644
index 000000000000..f0b076c2de77
--- /dev/null
+++ b/command/src/test/resources/configure/uat.properties
@@ -0,0 +1,33 @@
+#project information
+app_name=App Name
+app_version=V6.5
+
+#Common Configure
+##UAPHOME path, USE '/' for path separator
+nc_home=
+##verify log path, USE '/' for path separator
+log_file=debug.log
+
+# 0 don't print app log information on test result log
+# 1 only print app log information on test result log for fail testcase
+# 2 print application log information on test result log for all testcase
+uatlog_switch=2
+
+#dataFile Configure ,backup database data and restore database data
+data_backup_file = c:/temp/datafile.xml
+
+#default datasource
+default_datasource=design
+
+#BusinessServer configure
+serverstart=off
+login_username=
+login_password=
+
+#resources settings
+nc_configure_dir=resources/configure/
+testdata_config_dir=resources/data/conf/
+testdata_springfile_dir=resources/data/spring/
+testdata_objectfile_dir=resources/data/object/
+testdata_excelfile_dir=resources/data/excel/
+testdata_backup_dir=resources/data/backup/
diff --git a/command/src/test/resources/configure/uat_spring_conf.xml b/command/src/test/resources/configure/uat_spring_conf.xml
new file mode 100644
index 000000000000..169a91514700
--- /dev/null
+++ b/command/src/test/resources/configure/uat_spring_conf.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/command/src/test/resources/data/backup/README b/command/src/test/resources/data/backup/README
new file mode 100644
index 000000000000..a5b99861a7dc
--- /dev/null
+++ b/command/src/test/resources/data/backup/README
@@ -0,0 +1 @@
+备份文件夹
\ No newline at end of file
diff --git a/command/src/test/resources/data/config/README b/command/src/test/resources/data/config/README
new file mode 100644
index 000000000000..4849e2aef709
--- /dev/null
+++ b/command/src/test/resources/data/config/README
@@ -0,0 +1 @@
+Object配置文件夹
\ No newline at end of file
diff --git a/command/src/test/resources/data/excel/README b/command/src/test/resources/data/excel/README
new file mode 100644
index 000000000000..4849e2aef709
--- /dev/null
+++ b/command/src/test/resources/data/excel/README
@@ -0,0 +1 @@
+Object配置文件夹
\ No newline at end of file
diff --git a/command/src/test/resources/data/object/README b/command/src/test/resources/data/object/README
new file mode 100644
index 000000000000..271c286f3687
--- /dev/null
+++ b/command/src/test/resources/data/object/README
@@ -0,0 +1 @@
+固化结果文件夹
\ No newline at end of file
diff --git a/command/src/test/resources/data/spring/README b/command/src/test/resources/data/spring/README
new file mode 100644
index 000000000000..961ee7009fd2
--- /dev/null
+++ b/command/src/test/resources/data/spring/README
@@ -0,0 +1 @@
+spring 配置文件夹
\ No newline at end of file
diff --git a/command/src/test/resources/temp/README b/command/src/test/resources/temp/README
new file mode 100644
index 000000000000..ccffba66ffdd
--- /dev/null
+++ b/command/src/test/resources/temp/README
@@ -0,0 +1 @@
+临时文件夹
\ No newline at end of file
diff --git a/command/src/test/testng.xml b/command/src/test/testng.xml
new file mode 100644
index 000000000000..1fa0f7461a59
--- /dev/null
+++ b/command/src/test/testng.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/composite/.gitignore b/composite/.gitignore
new file mode 100644
index 000000000000..5e56e040ec09
--- /dev/null
+++ b/composite/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/composite/composite.iml b/composite/composite.iml
new file mode 100644
index 000000000000..57a0548ee6df
--- /dev/null
+++ b/composite/composite.iml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/composite/out/.gitignore b/composite/out/.gitignore
new file mode 100644
index 000000000000..5e56e040ec09
--- /dev/null
+++ b/composite/out/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/composite/src/main/java/com/iluwatar/App.java b/composite/src/main/java/com/iluwatar/composite/App.java
similarity index 92%
rename from composite/src/main/java/com/iluwatar/App.java
rename to composite/src/main/java/com/iluwatar/composite/App.java
index 99229fdb0442..d6e5a95d8531 100644
--- a/composite/src/main/java/com/iluwatar/App.java
+++ b/composite/src/main/java/com/iluwatar/composite/App.java
@@ -1,26 +1,26 @@
-package com.iluwatar;
-
-/**
- *
- * With Composite we can treat tree hierarchies of objects
- * with uniform interface (LetterComposite). In this example
- * we have sentences composed of words composed of letters.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println("Message from the orcs: ");
-
- LetterComposite orcMessage = new Messenger().messageFromOrcs();
- orcMessage.print();
-
- System.out.println("\n");
-
- System.out.println("Message from the elves: ");
-
- LetterComposite elfMessage = new Messenger().messageFromElves();
- elfMessage.print();
- }
-}
+package com.iluwatar.composite;
+
+/**
+ *
+ * With Composite we can treat tree hierarchies of objects
+ * with uniform interface (LetterComposite). In this example
+ * we have sentences composed of words composed of letters.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println("Message from the orcs: ");
+
+ LetterComposite orcMessage = new Messenger().messageFromOrcs();
+ orcMessage.print();
+
+ System.out.println("\n");
+
+ System.out.println("Message from the elves: ");
+
+ LetterComposite elfMessage = new Messenger().messageFromElves();
+ elfMessage.print();
+ }
+}
diff --git a/composite/src/main/java/com/iluwatar/Letter.java b/composite/src/main/java/com/iluwatar/composite/Letter.java
similarity index 85%
rename from composite/src/main/java/com/iluwatar/Letter.java
rename to composite/src/main/java/com/iluwatar/composite/Letter.java
index f0a25b6d4791..5b184b809524 100644
--- a/composite/src/main/java/com/iluwatar/Letter.java
+++ b/composite/src/main/java/com/iluwatar/composite/Letter.java
@@ -1,21 +1,21 @@
-package com.iluwatar;
-
-public class Letter extends LetterComposite {
-
- private char c;
-
- public Letter(char c) {
- this.c = c;
- }
-
- @Override
- protected void printThisBefore() {
- System.out.print(c);
- }
-
- @Override
- protected void printThisAfter() {
- // nop
- }
-
-}
+package com.iluwatar.composite;
+
+public class Letter extends LetterComposite {
+
+ private char c;
+
+ public Letter(char c) {
+ this.c = c;
+ }
+
+ @Override
+ protected void printThisBefore() {
+ System.out.print(c);
+ }
+
+ @Override
+ protected void printThisAfter() {
+ // nop
+ }
+
+}
diff --git a/composite/src/main/java/com/iluwatar/LetterComposite.java b/composite/src/main/java/com/iluwatar/composite/LetterComposite.java
similarity index 90%
rename from composite/src/main/java/com/iluwatar/LetterComposite.java
rename to composite/src/main/java/com/iluwatar/composite/LetterComposite.java
index 850c410ffea6..81c5f7039f6f 100644
--- a/composite/src/main/java/com/iluwatar/LetterComposite.java
+++ b/composite/src/main/java/com/iluwatar/composite/LetterComposite.java
@@ -1,34 +1,34 @@
-package com.iluwatar;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * Composite interface.
- *
- */
-public abstract class LetterComposite {
-
- private List children = new ArrayList();
-
- public void add(LetterComposite letter) {
- children.add(letter);
- }
-
- public int count() {
- return children.size();
- }
-
- protected abstract void printThisBefore();
-
- protected abstract void printThisAfter();
-
- public void print() {
- printThisBefore();
- for (LetterComposite letter: children) {
- letter.print();
- }
- printThisAfter();
- }
-}
+package com.iluwatar.composite;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * Composite interface.
+ *
+ */
+public abstract class LetterComposite {
+
+ private List children = new ArrayList();
+
+ public void add(LetterComposite letter) {
+ children.add(letter);
+ }
+
+ public int count() {
+ return children.size();
+ }
+
+ protected abstract void printThisBefore();
+
+ protected abstract void printThisAfter();
+
+ public void print() {
+ printThisBefore();
+ for (LetterComposite letter: children) {
+ letter.print();
+ }
+ printThisAfter();
+ }
+}
diff --git a/composite/src/main/java/com/iluwatar/Messenger.java b/composite/src/main/java/com/iluwatar/composite/Messenger.java
similarity index 96%
rename from composite/src/main/java/com/iluwatar/Messenger.java
rename to composite/src/main/java/com/iluwatar/composite/Messenger.java
index d87a94b0d723..5b892fe110d7 100644
--- a/composite/src/main/java/com/iluwatar/Messenger.java
+++ b/composite/src/main/java/com/iluwatar/composite/Messenger.java
@@ -1,42 +1,42 @@
-package com.iluwatar;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class Messenger {
-
- LetterComposite messageFromOrcs() {
-
- List words = new ArrayList();
-
- words.add(new Word(Arrays.asList(new Letter('W'), new Letter('h'), new Letter('e'), new Letter('r'), new Letter('e'))));
- words.add(new Word(Arrays.asList(new Letter('t'), new Letter('h'), new Letter('e'), new Letter('r'), new Letter('e'))));
- words.add(new Word(Arrays.asList(new Letter('i'), new Letter('s'))));
- words.add(new Word(Arrays.asList(new Letter('a'))));
- words.add(new Word(Arrays.asList(new Letter('w'), new Letter('h'), new Letter('i'), new Letter('p'))));
- words.add(new Word(Arrays.asList(new Letter('t'), new Letter('h'), new Letter('e'), new Letter('r'), new Letter('e'))));
- words.add(new Word(Arrays.asList(new Letter('i'), new Letter('s'))));
- words.add(new Word(Arrays.asList(new Letter('a'))));
- words.add(new Word(Arrays.asList(new Letter('w'), new Letter('a'), new Letter('y'))));
-
- return new Sentence(words);
-
- }
-
- LetterComposite messageFromElves() {
-
- List words = new ArrayList();
-
- words.add(new Word(Arrays.asList(new Letter('M'), new Letter('u'), new Letter('c'), new Letter('h'))));
- words.add(new Word(Arrays.asList(new Letter('w'), new Letter('i'), new Letter('n'), new Letter('d'))));
- words.add(new Word(Arrays.asList(new Letter('p'), new Letter('o'), new Letter('u'), new Letter('r'), new Letter('s'))));
- words.add(new Word(Arrays.asList(new Letter('f'), new Letter('r'), new Letter('o'), new Letter('m'))));
- words.add(new Word(Arrays.asList(new Letter('y'), new Letter('o'), new Letter('u'), new Letter('r'))));
- words.add(new Word(Arrays.asList(new Letter('m'), new Letter('o'), new Letter('u'), new Letter('t'), new Letter('h'))));
-
- return new Sentence(words);
-
- }
-
-}
+package com.iluwatar.composite;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class Messenger {
+
+ LetterComposite messageFromOrcs() {
+
+ List words = new ArrayList();
+
+ words.add(new Word(Arrays.asList(new Letter('W'), new Letter('h'), new Letter('e'), new Letter('r'), new Letter('e'))));
+ words.add(new Word(Arrays.asList(new Letter('t'), new Letter('h'), new Letter('e'), new Letter('r'), new Letter('e'))));
+ words.add(new Word(Arrays.asList(new Letter('i'), new Letter('s'))));
+ words.add(new Word(Arrays.asList(new Letter('a'))));
+ words.add(new Word(Arrays.asList(new Letter('w'), new Letter('h'), new Letter('i'), new Letter('p'))));
+ words.add(new Word(Arrays.asList(new Letter('t'), new Letter('h'), new Letter('e'), new Letter('r'), new Letter('e'))));
+ words.add(new Word(Arrays.asList(new Letter('i'), new Letter('s'))));
+ words.add(new Word(Arrays.asList(new Letter('a'))));
+ words.add(new Word(Arrays.asList(new Letter('w'), new Letter('a'), new Letter('y'))));
+
+ return new Sentence(words);
+
+ }
+
+ LetterComposite messageFromElves() {
+
+ List words = new ArrayList();
+
+ words.add(new Word(Arrays.asList(new Letter('M'), new Letter('u'), new Letter('c'), new Letter('h'))));
+ words.add(new Word(Arrays.asList(new Letter('w'), new Letter('i'), new Letter('n'), new Letter('d'))));
+ words.add(new Word(Arrays.asList(new Letter('p'), new Letter('o'), new Letter('u'), new Letter('r'), new Letter('s'))));
+ words.add(new Word(Arrays.asList(new Letter('f'), new Letter('r'), new Letter('o'), new Letter('m'))));
+ words.add(new Word(Arrays.asList(new Letter('y'), new Letter('o'), new Letter('u'), new Letter('r'))));
+ words.add(new Word(Arrays.asList(new Letter('m'), new Letter('o'), new Letter('u'), new Letter('t'), new Letter('h'))));
+
+ return new Sentence(words);
+
+ }
+
+}
diff --git a/composite/src/main/java/com/iluwatar/Sentence.java b/composite/src/main/java/com/iluwatar/composite/Sentence.java
similarity index 86%
rename from composite/src/main/java/com/iluwatar/Sentence.java
rename to composite/src/main/java/com/iluwatar/composite/Sentence.java
index 6eb97bc4b14f..b09a9a486bfb 100644
--- a/composite/src/main/java/com/iluwatar/Sentence.java
+++ b/composite/src/main/java/com/iluwatar/composite/Sentence.java
@@ -1,24 +1,24 @@
-package com.iluwatar;
-
-import java.util.List;
-
-public class Sentence extends LetterComposite {
-
- public Sentence(List words) {
- for (Word w: words) {
- this.add(w);
- }
- }
-
- @Override
- protected void printThisBefore() {
- // nop
- }
-
- @Override
- protected void printThisAfter() {
- System.out.print(".");
- }
-
-
-}
+package com.iluwatar.composite;
+
+import java.util.List;
+
+public class Sentence extends LetterComposite {
+
+ public Sentence(List words) {
+ for (Word w: words) {
+ this.add(w);
+ }
+ }
+
+ @Override
+ protected void printThisBefore() {
+ // nop
+ }
+
+ @Override
+ protected void printThisAfter() {
+ System.out.print(".");
+ }
+
+
+}
diff --git a/composite/src/main/java/com/iluwatar/Word.java b/composite/src/main/java/com/iluwatar/composite/Word.java
similarity index 86%
rename from composite/src/main/java/com/iluwatar/Word.java
rename to composite/src/main/java/com/iluwatar/composite/Word.java
index ef8ea3b6ab46..1cb131602202 100644
--- a/composite/src/main/java/com/iluwatar/Word.java
+++ b/composite/src/main/java/com/iluwatar/composite/Word.java
@@ -1,23 +1,23 @@
-package com.iluwatar;
-
-import java.util.List;
-
-public class Word extends LetterComposite {
-
- public Word(List letters) {
- for (Letter l: letters) {
- this.add(l);
- }
- }
-
- @Override
- protected void printThisBefore() {
- System.out.print(" ");
- }
-
- @Override
- protected void printThisAfter() {
- // nop
- }
-
-}
+package com.iluwatar.composite;
+
+import java.util.List;
+
+public class Word extends LetterComposite {
+
+ public Word(List letters) {
+ for (Letter l: letters) {
+ this.add(l);
+ }
+ }
+
+ @Override
+ protected void printThisBefore() {
+ System.out.print(" ");
+ }
+
+ @Override
+ protected void printThisAfter() {
+ // nop
+ }
+
+}
diff --git a/composite/src/test/log4j.xml b/composite/src/test/log4j.xml
new file mode 100644
index 000000000000..748d0c1a5271
--- /dev/null
+++ b/composite/src/test/log4j.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/composite/src/test/resources/configure/UATApplicationContext.xml b/composite/src/test/resources/configure/UATApplicationContext.xml
new file mode 100644
index 000000000000..818ef52f909e
--- /dev/null
+++ b/composite/src/test/resources/configure/UATApplicationContext.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/composite/src/test/resources/configure/prop.xml b/composite/src/test/resources/configure/prop.xml
new file mode 100644
index 000000000000..c7afbd60d256
--- /dev/null
+++ b/composite/src/test/resources/configure/prop.xml
@@ -0,0 +1,133 @@
+
+
+ false
+
+
+ $JAVA_HOME
+ server
+ -server -Xmx768m -XX:PermSize=128m -XX:MaxPermSize=256m -Duser.timezone=GMT+8 -Djava.awt.headless=true
+ 8005
+
+ 80
+
+
+
+ true
+
+ StartTomcat
+ nc.bs.tomcat.startup.BootStrapTomcatService
+ 15
+ true
+ false
+ start|stop
+
+
+ EJB_SERVICE
+ nc.bs.mw.naming.EJBContainerService
+ 15
+ true
+ false
+ start|stop
+
+ nc.bs.mw.tran.IerpTransactionManagerProxy
+ nc.bs.mw.tran.IerpUserTransaction
+ nc.bs.mw.tran.IerpTransactionManager
+ nc.bs.mw.sql.UFSqlObject
+ nc.bs.mw.ejbsql.IerpXADataSource
+
+ design
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ baptest807
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ bafi
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ bafi
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ iufo6103312
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ iufo6103312
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ batm
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ batm
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ bap8
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ bap8
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ foodmart
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ foodmart
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
\ No newline at end of file
diff --git a/composite/src/test/resources/configure/test_data_source.xml b/composite/src/test/resources/configure/test_data_source.xml
new file mode 100644
index 000000000000..2e45d5ee869c
--- /dev/null
+++ b/composite/src/test/resources/configure/test_data_source.xml
@@ -0,0 +1,19 @@
+
+
+
+ design
+ Z
+ jdbc:sqlserver://uapxt02:1433;database=newwf_1010;sendStringParametersAsUnicode=false;responseBuffering=adaptive
+ sa
+ sasasa
+ com.microsoft.sqlserver.jdbc.SQLServerDriver
+ SQLSERVER2008
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
\ No newline at end of file
diff --git a/composite/src/test/resources/configure/uat.properties b/composite/src/test/resources/configure/uat.properties
new file mode 100644
index 000000000000..f0b076c2de77
--- /dev/null
+++ b/composite/src/test/resources/configure/uat.properties
@@ -0,0 +1,33 @@
+#project information
+app_name=App Name
+app_version=V6.5
+
+#Common Configure
+##UAPHOME path, USE '/' for path separator
+nc_home=
+##verify log path, USE '/' for path separator
+log_file=debug.log
+
+# 0 don't print app log information on test result log
+# 1 only print app log information on test result log for fail testcase
+# 2 print application log information on test result log for all testcase
+uatlog_switch=2
+
+#dataFile Configure ,backup database data and restore database data
+data_backup_file = c:/temp/datafile.xml
+
+#default datasource
+default_datasource=design
+
+#BusinessServer configure
+serverstart=off
+login_username=
+login_password=
+
+#resources settings
+nc_configure_dir=resources/configure/
+testdata_config_dir=resources/data/conf/
+testdata_springfile_dir=resources/data/spring/
+testdata_objectfile_dir=resources/data/object/
+testdata_excelfile_dir=resources/data/excel/
+testdata_backup_dir=resources/data/backup/
diff --git a/composite/src/test/resources/configure/uat_spring_conf.xml b/composite/src/test/resources/configure/uat_spring_conf.xml
new file mode 100644
index 000000000000..169a91514700
--- /dev/null
+++ b/composite/src/test/resources/configure/uat_spring_conf.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/composite/src/test/resources/data/backup/README b/composite/src/test/resources/data/backup/README
new file mode 100644
index 000000000000..a5b99861a7dc
--- /dev/null
+++ b/composite/src/test/resources/data/backup/README
@@ -0,0 +1 @@
+备份文件夹
\ No newline at end of file
diff --git a/composite/src/test/resources/data/config/README b/composite/src/test/resources/data/config/README
new file mode 100644
index 000000000000..4849e2aef709
--- /dev/null
+++ b/composite/src/test/resources/data/config/README
@@ -0,0 +1 @@
+Object配置文件夹
\ No newline at end of file
diff --git a/composite/src/test/resources/data/excel/README b/composite/src/test/resources/data/excel/README
new file mode 100644
index 000000000000..4849e2aef709
--- /dev/null
+++ b/composite/src/test/resources/data/excel/README
@@ -0,0 +1 @@
+Object配置文件夹
\ No newline at end of file
diff --git a/composite/src/test/resources/data/object/README b/composite/src/test/resources/data/object/README
new file mode 100644
index 000000000000..271c286f3687
--- /dev/null
+++ b/composite/src/test/resources/data/object/README
@@ -0,0 +1 @@
+固化结果文件夹
\ No newline at end of file
diff --git a/composite/src/test/resources/data/spring/README b/composite/src/test/resources/data/spring/README
new file mode 100644
index 000000000000..961ee7009fd2
--- /dev/null
+++ b/composite/src/test/resources/data/spring/README
@@ -0,0 +1 @@
+spring 配置文件夹
\ No newline at end of file
diff --git a/composite/src/test/resources/temp/README b/composite/src/test/resources/temp/README
new file mode 100644
index 000000000000..ccffba66ffdd
--- /dev/null
+++ b/composite/src/test/resources/temp/README
@@ -0,0 +1 @@
+临时文件夹
\ No newline at end of file
diff --git a/composite/src/test/testng.xml b/composite/src/test/testng.xml
new file mode 100644
index 000000000000..1fa0f7461a59
--- /dev/null
+++ b/composite/src/test/testng.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/decorator/decorator.iml b/decorator/decorator.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/decorator/decorator.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/decorator/src/main/java/com/iluwatar/App.java b/decorator/src/main/java/com/iluwatar/decorator/App.java
similarity index 92%
rename from decorator/src/main/java/com/iluwatar/App.java
rename to decorator/src/main/java/com/iluwatar/decorator/App.java
index 77978844d016..71e55a448b4d 100644
--- a/decorator/src/main/java/com/iluwatar/App.java
+++ b/decorator/src/main/java/com/iluwatar/decorator/App.java
@@ -1,26 +1,26 @@
-package com.iluwatar;
-
-/**
- *
- * Decorator pattern is more flexible alternative to
- * subclassing. The decorator class implements the same
- * interface as the target and uses composition to
- * "decorate" calls to the target.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
-
- System.out.println("A simple looking troll approaches.");
- Hostile troll = new Troll();
- troll.attack();
- troll.fleeBattle();
-
- System.out.println("\nA smart looking troll surprises you.");
- Hostile smart = new SmartTroll(new Troll());
- smart.attack();
- smart.fleeBattle();
- }
-}
+package com.iluwatar.decorator;
+
+/**
+ *
+ * Decorator pattern is more flexible alternative to
+ * subclassing. The decorator class implements the same
+ * interface as the target and uses composition to
+ * "decorate" calls to the target.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+
+ System.out.println("A simple looking troll approaches.");
+ Hostile troll = new Troll();
+ troll.attack();
+ troll.fleeBattle();
+
+ System.out.println("\nA smart looking troll surprises you.");
+ Hostile smart = new SmartTroll(new Troll());
+ smart.attack();
+ smart.fleeBattle();
+ }
+}
diff --git a/decorator/src/main/java/com/iluwatar/Hostile.java b/decorator/src/main/java/com/iluwatar/decorator/Hostile.java
similarity index 68%
rename from decorator/src/main/java/com/iluwatar/Hostile.java
rename to decorator/src/main/java/com/iluwatar/decorator/Hostile.java
index 38b2cad07f6c..af7cbc337986 100644
--- a/decorator/src/main/java/com/iluwatar/Hostile.java
+++ b/decorator/src/main/java/com/iluwatar/decorator/Hostile.java
@@ -1,8 +1,8 @@
-package com.iluwatar;
-
-public interface Hostile {
-
- void attack();
- void fleeBattle();
-
-}
+package com.iluwatar.decorator;
+
+public interface Hostile {
+
+ void attack();
+ void fleeBattle();
+
+}
diff --git a/decorator/src/main/java/com/iluwatar/SmartTroll.java b/decorator/src/main/java/com/iluwatar/decorator/SmartTroll.java
similarity index 89%
rename from decorator/src/main/java/com/iluwatar/SmartTroll.java
rename to decorator/src/main/java/com/iluwatar/decorator/SmartTroll.java
index d931adff86a0..9792f5923541 100644
--- a/decorator/src/main/java/com/iluwatar/SmartTroll.java
+++ b/decorator/src/main/java/com/iluwatar/decorator/SmartTroll.java
@@ -1,23 +1,23 @@
-package com.iluwatar;
-
-public class SmartTroll implements Hostile {
-
- private Hostile decorated;
-
- public SmartTroll(Hostile decorated) {
- this.decorated = decorated;
- }
-
- @Override
- public void attack() {
- System.out.println("The troll throws a rock at you!");
- decorated.attack();
- }
-
- @Override
- public void fleeBattle() {
- System.out.println("The troll calls for help!");
- decorated.fleeBattle();
- }
-
-}
+package com.iluwatar.decorator;
+
+public class SmartTroll implements Hostile {
+
+ private Hostile decorated;
+
+ public SmartTroll(Hostile decorated) {
+ this.decorated = decorated;
+ }
+
+ @Override
+ public void attack() {
+ System.out.println("The troll throws a rock at you!");
+ decorated.attack();
+ }
+
+ @Override
+ public void fleeBattle() {
+ System.out.println("The troll calls for help!");
+ decorated.fleeBattle();
+ }
+
+}
diff --git a/decorator/src/main/java/com/iluwatar/Troll.java b/decorator/src/main/java/com/iluwatar/decorator/Troll.java
similarity index 87%
rename from decorator/src/main/java/com/iluwatar/Troll.java
rename to decorator/src/main/java/com/iluwatar/decorator/Troll.java
index 3bcf4ec472d4..a194f9e586f4 100644
--- a/decorator/src/main/java/com/iluwatar/Troll.java
+++ b/decorator/src/main/java/com/iluwatar/decorator/Troll.java
@@ -1,13 +1,13 @@
-package com.iluwatar;
-
-public class Troll implements Hostile {
-
- public void attack() {
- System.out.println("The troll swings at you with a club!");
- }
-
- public void fleeBattle() {
- System.out.println("The troll shrieks in horror and runs away!");
- }
-
-}
+package com.iluwatar.decorator;
+
+public class Troll implements Hostile {
+
+ public void attack() {
+ System.out.println("The troll swings at you with a club!");
+ }
+
+ public void fleeBattle() {
+ System.out.println("The troll shrieks in horror and runs away!");
+ }
+
+}
diff --git a/double-checked-locking/double-checked-locking.iml b/double-checked-locking/double-checked-locking.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/double-checked-locking/double-checked-locking.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/double-checked-locking/src/main/java/com/iluwatar/App.java b/double-checked-locking/src/main/java/com/iluwatardbcheck/App.java
similarity index 89%
rename from double-checked-locking/src/main/java/com/iluwatar/App.java
rename to double-checked-locking/src/main/java/com/iluwatardbcheck/App.java
index 7e6bfd532c45..6af96588841e 100644
--- a/double-checked-locking/src/main/java/com/iluwatar/App.java
+++ b/double-checked-locking/src/main/java/com/iluwatardbcheck/App.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatardbcheck;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -22,7 +22,9 @@ public static void main( String[] args )
executorService.execute(new Runnable() {
@Override
public void run() {
- while(inventory.addItem(new Item()));
+ while(inventory.addItem(new Item())) {
+ ;
+ }
}
});
}
diff --git a/double-checked-locking/src/main/java/com/iluwatar/Inventory.java b/double-checked-locking/src/main/java/com/iluwatardbcheck/Inventory.java
similarity index 89%
rename from double-checked-locking/src/main/java/com/iluwatar/Inventory.java
rename to double-checked-locking/src/main/java/com/iluwatardbcheck/Inventory.java
index a6ddc350d83d..69b4ffc1a925 100644
--- a/double-checked-locking/src/main/java/com/iluwatar/Inventory.java
+++ b/double-checked-locking/src/main/java/com/iluwatardbcheck/Inventory.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatardbcheck;
import java.util.ArrayList;
import java.util.List;
@@ -14,7 +14,7 @@ public class Inventory {
public Inventory(int inventorySize) {
this.inventorySize = inventorySize;
- this.items = new ArrayList- (inventorySize);
+ items = new ArrayList
- (inventorySize);
}
public boolean addItem(Item item){
diff --git a/double-checked-locking/src/main/java/com/iluwatar/Item.java b/double-checked-locking/src/main/java/com/iluwatardbcheck/Item.java
similarity index 62%
rename from double-checked-locking/src/main/java/com/iluwatar/Item.java
rename to double-checked-locking/src/main/java/com/iluwatardbcheck/Item.java
index 76e095e7e415..7fb0844ce52e 100644
--- a/double-checked-locking/src/main/java/com/iluwatar/Item.java
+++ b/double-checked-locking/src/main/java/com/iluwatardbcheck/Item.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatardbcheck;
public class Item {
String name;
diff --git a/facade/facade.iml b/facade/facade.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/facade/facade.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/facade/src/main/java/com/iluwatar/App.java b/facade/src/main/java/com/iluwatar/facade/App.java
similarity index 88%
rename from facade/src/main/java/com/iluwatar/App.java
rename to facade/src/main/java/com/iluwatar/facade/App.java
index 98d43511f857..cd09c43de88c 100644
--- a/facade/src/main/java/com/iluwatar/App.java
+++ b/facade/src/main/java/com/iluwatar/facade/App.java
@@ -1,18 +1,18 @@
-package com.iluwatar;
-
-/**
- *
- * Facade (DwarvenGoldmineFacade) provides simpler interface to
- * subsystem.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- DwarvenGoldmineFacade facade = new DwarvenGoldmineFacade();
- facade.startNewDay();
- facade.digOutGold();
- facade.endDay();
- }
-}
+package com.iluwatar.facade;
+
+/**
+ *
+ * Facade (DwarvenGoldmineFacade) provides simpler interface to
+ * subsystem.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ DwarvenGoldmineFacade facade = new DwarvenGoldmineFacade();
+ facade.startNewDay();
+ facade.digOutGold();
+ facade.endDay();
+ }
+}
diff --git a/facade/src/main/java/com/iluwatar/DwarvenCartOperator.java b/facade/src/main/java/com/iluwatar/facade/DwarvenCartOperator.java
similarity index 86%
rename from facade/src/main/java/com/iluwatar/DwarvenCartOperator.java
rename to facade/src/main/java/com/iluwatar/facade/DwarvenCartOperator.java
index ef13611a8d85..07b37133bef0 100644
--- a/facade/src/main/java/com/iluwatar/DwarvenCartOperator.java
+++ b/facade/src/main/java/com/iluwatar/facade/DwarvenCartOperator.java
@@ -1,15 +1,15 @@
-package com.iluwatar;
-
-public class DwarvenCartOperator extends DwarvenMineWorker {
-
- @Override
- public void work() {
- System.out.println(name() + " moves gold chunks out of the mine.");
- }
-
- @Override
- public String name() {
- return "Dwarf cart operator";
- }
-
-}
+package com.iluwatar.facade;
+
+public class DwarvenCartOperator extends DwarvenMineWorker {
+
+ @Override
+ public void work() {
+ System.out.println(name() + " moves gold chunks out of the mine.");
+ }
+
+ @Override
+ public String name() {
+ return "Dwarf cart operator";
+ }
+
+}
diff --git a/facade/src/main/java/com/iluwatar/DwarvenGoldDigger.java b/facade/src/main/java/com/iluwatar/facade/DwarvenGoldDigger.java
similarity index 85%
rename from facade/src/main/java/com/iluwatar/DwarvenGoldDigger.java
rename to facade/src/main/java/com/iluwatar/facade/DwarvenGoldDigger.java
index ea7c7e68e393..5cafdcfb663d 100644
--- a/facade/src/main/java/com/iluwatar/DwarvenGoldDigger.java
+++ b/facade/src/main/java/com/iluwatar/facade/DwarvenGoldDigger.java
@@ -1,15 +1,15 @@
-package com.iluwatar;
-
-public class DwarvenGoldDigger extends DwarvenMineWorker {
-
- @Override
- public void work() {
- System.out.println(name() + " digs for gold.");
- }
-
- @Override
- public String name() {
- return "Dwarf gold digger";
- }
-
-}
+package com.iluwatar.facade;
+
+public class DwarvenGoldDigger extends DwarvenMineWorker {
+
+ @Override
+ public void work() {
+ System.out.println(name() + " digs for gold.");
+ }
+
+ @Override
+ public String name() {
+ return "Dwarf gold digger";
+ }
+
+}
diff --git a/facade/src/main/java/com/iluwatar/DwarvenGoldmineFacade.java b/facade/src/main/java/com/iluwatar/facade/DwarvenGoldmineFacade.java
similarity index 86%
rename from facade/src/main/java/com/iluwatar/DwarvenGoldmineFacade.java
rename to facade/src/main/java/com/iluwatar/facade/DwarvenGoldmineFacade.java
index a8a71bef5b05..9e9e7bf96a65 100644
--- a/facade/src/main/java/com/iluwatar/DwarvenGoldmineFacade.java
+++ b/facade/src/main/java/com/iluwatar/facade/DwarvenGoldmineFacade.java
@@ -1,37 +1,37 @@
-package com.iluwatar;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DwarvenGoldmineFacade {
-
- List workers;
-
- public DwarvenGoldmineFacade() {
- workers = new ArrayList<>();
- workers.add(new DwarvenGoldDigger());
- workers.add(new DwarvenCartOperator());
- workers.add(new DwarvenTunnelDigger());
- }
-
- public void startNewDay() {
- for (DwarvenMineWorker worker: workers) {
- worker.wakeUp();
- worker.goToMine();
- }
- }
-
- public void digOutGold() {
- for (DwarvenMineWorker worker: workers) {
- worker.work();
- }
- }
-
- public void endDay() {
- for (DwarvenMineWorker worker: workers) {
- worker.goHome();
- worker.goToSleep();
- }
- }
-
-}
+package com.iluwatar.facade;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DwarvenGoldmineFacade {
+
+ List workers;
+
+ public DwarvenGoldmineFacade() {
+ workers = new ArrayList();
+ workers.add(new DwarvenGoldDigger());
+ workers.add(new DwarvenCartOperator());
+ workers.add(new DwarvenTunnelDigger());
+ }
+
+ public void startNewDay() {
+ for (DwarvenMineWorker worker: workers) {
+ worker.wakeUp();
+ worker.goToMine();
+ }
+ }
+
+ public void digOutGold() {
+ for (DwarvenMineWorker worker: workers) {
+ worker.work();
+ }
+ }
+
+ public void endDay() {
+ for (DwarvenMineWorker worker: workers) {
+ worker.goHome();
+ worker.goToSleep();
+ }
+ }
+
+}
diff --git a/facade/src/main/java/com/iluwatar/DwarvenMineWorker.java b/facade/src/main/java/com/iluwatar/facade/DwarvenMineWorker.java
similarity index 90%
rename from facade/src/main/java/com/iluwatar/DwarvenMineWorker.java
rename to facade/src/main/java/com/iluwatar/facade/DwarvenMineWorker.java
index 21b936738808..c8a37c83996e 100644
--- a/facade/src/main/java/com/iluwatar/DwarvenMineWorker.java
+++ b/facade/src/main/java/com/iluwatar/facade/DwarvenMineWorker.java
@@ -1,25 +1,25 @@
-package com.iluwatar;
-
-public abstract class DwarvenMineWorker {
-
- public void goToSleep() {
- System.out.println(name() + " goes to sleep.");
- }
-
- public void wakeUp() {
- System.out.println(name() + " wakes up.");
- }
-
- public void goHome() {
- System.out.println(name() + " goes home.");
- }
-
- public void goToMine() {
- System.out.println(name() + " goes to the mine.");
- }
-
- public abstract void work();
-
- public abstract String name();
-
-}
+package com.iluwatar.facade;
+
+public abstract class DwarvenMineWorker {
+
+ public void goToSleep() {
+ System.out.println(name() + " goes to sleep.");
+ }
+
+ public void wakeUp() {
+ System.out.println(name() + " wakes up.");
+ }
+
+ public void goHome() {
+ System.out.println(name() + " goes home.");
+ }
+
+ public void goToMine() {
+ System.out.println(name() + " goes to the mine.");
+ }
+
+ public abstract void work();
+
+ public abstract String name();
+
+}
diff --git a/facade/src/main/java/com/iluwatar/DwarvenTunnelDigger.java b/facade/src/main/java/com/iluwatar/facade/DwarvenTunnelDigger.java
similarity index 86%
rename from facade/src/main/java/com/iluwatar/DwarvenTunnelDigger.java
rename to facade/src/main/java/com/iluwatar/facade/DwarvenTunnelDigger.java
index b8ef1833247c..62b3fc3ff147 100644
--- a/facade/src/main/java/com/iluwatar/DwarvenTunnelDigger.java
+++ b/facade/src/main/java/com/iluwatar/facade/DwarvenTunnelDigger.java
@@ -1,15 +1,15 @@
-package com.iluwatar;
-
-public class DwarvenTunnelDigger extends DwarvenMineWorker {
-
- @Override
- public void work() {
- System.out.println(name() + " creates another promising tunnel.");
- }
-
- @Override
- public String name() {
- return "Dwarven tunnel digger";
- }
-
-}
+package com.iluwatar.facade;
+
+public class DwarvenTunnelDigger extends DwarvenMineWorker {
+
+ @Override
+ public void work() {
+ System.out.println(name() + " creates another promising tunnel.");
+ }
+
+ @Override
+ public String name() {
+ return "Dwarven tunnel digger";
+ }
+
+}
diff --git a/factory-method/.gitignore b/factory-method/.gitignore
index b83d22266ac8..e2540458518e 100644
--- a/factory-method/.gitignore
+++ b/factory-method/.gitignore
@@ -1 +1,2 @@
/target/
+/bin
diff --git a/factory-method/factory-method.iml b/factory-method/factory-method.iml
new file mode 100644
index 000000000000..57a0548ee6df
--- /dev/null
+++ b/factory-method/factory-method.iml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/factory-method/out/.gitignore b/factory-method/out/.gitignore
new file mode 100644
index 000000000000..5e56e040ec09
--- /dev/null
+++ b/factory-method/out/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/factory-method/src/main/java/com/iluwatar/App.java b/factory-method/src/main/java/com/iluwatar/App.java
deleted file mode 100644
index d9af81227b9f..000000000000
--- a/factory-method/src/main/java/com/iluwatar/App.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.iluwatar;
-
-/**
- *
- * In Factory Method we have an interface (Blacksmith) with a
- * method for creating objects (manufactureWeapon). The concrete
- * subclasses (OrcBlacksmith, ElfBlacksmith) then override the
- * method to produce objects of their liking.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- Blacksmith blacksmith;
- Weapon weapon;
-
- blacksmith = new OrcBlacksmith();
- weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
- System.out.println(weapon);
- weapon = blacksmith.manufactureWeapon(WeaponType.AXE);
- System.out.println(weapon);
-
- blacksmith = new ElfBlacksmith();
- weapon = blacksmith.manufactureWeapon(WeaponType.SHORT_SWORD);
- System.out.println(weapon);
- weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
- System.out.println(weapon);
- }
-}
diff --git a/factory-method/src/main/java/com/iluwatar/Weapon.java b/factory-method/src/main/java/com/iluwatar/Weapon.java
deleted file mode 100644
index 0787c38f3e15..000000000000
--- a/factory-method/src/main/java/com/iluwatar/Weapon.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.iluwatar;
-
-public interface Weapon {
-
-}
diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/App.java b/factory-method/src/main/java/com/iluwatar/factory/method/App.java
new file mode 100644
index 000000000000..f406b1931003
--- /dev/null
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/App.java
@@ -0,0 +1,35 @@
+package com.iluwatar.factory.method;
+
+
+/**
+ *
+ * In Factory Method we have an interface (Blacksmith) with a
+ * method for creating objects (manufactureWeapon). The concrete
+ * subclasses (OrcBlacksmith, ElfBlacksmith) then override the
+ * method to produce objects of their liking.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ Blacksmith blacksmith;
+ Weapon weapon;
+
+ blacksmith = new OrcBlacksmith();
+ weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
+ System.out.println(weapon);
+ weapon = blacksmith.manufactureWeapon(WeaponType.AXE);
+ System.out.println(weapon);
+
+ blacksmith = new ElfBlacksmith();
+ weapon = blacksmith.manufactureWeapon(WeaponType.SHORT_SWORD);
+ System.out.println(weapon);
+ weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
+ System.out.println(weapon);
+
+ blacksmith = new Testsmith();
+ weapon = blacksmith.manufactureWeapon(WeaponType.TEST);
+ System.out.print(weapon);
+ }
+}
diff --git a/factory-method/src/main/java/com/iluwatar/Blacksmith.java b/factory-method/src/main/java/com/iluwatar/factory/method/Blacksmith.java
similarity index 78%
rename from factory-method/src/main/java/com/iluwatar/Blacksmith.java
rename to factory-method/src/main/java/com/iluwatar/factory/method/Blacksmith.java
index ac488b27d8c9..64ec02980bff 100644
--- a/factory-method/src/main/java/com/iluwatar/Blacksmith.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/Blacksmith.java
@@ -1,12 +1,14 @@
-package com.iluwatar;
-
-/**
- *
- * The interface containing method for producing objects.
- *
- */
-public interface Blacksmith {
-
- Weapon manufactureWeapon(WeaponType weaponType);
-
-}
+package com.iluwatar.factory.method;
+
+
+
+/**
+ *
+ * The interface containing method for producing objects.
+ *
+ */
+public interface Blacksmith {
+
+ Weapon manufactureWeapon(WeaponType weaponType);
+
+}
diff --git a/factory-method/src/main/java/com/iluwatar/ElfBlacksmith.java b/factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java
similarity index 79%
rename from factory-method/src/main/java/com/iluwatar/ElfBlacksmith.java
rename to factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java
index 067584088e13..0a358d248dac 100644
--- a/factory-method/src/main/java/com/iluwatar/ElfBlacksmith.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java
@@ -1,14 +1,17 @@
-package com.iluwatar;
-
-/**
- *
- * Concrete subclass for creating new objects.
- *
- */
-public class ElfBlacksmith implements Blacksmith {
-
- public Weapon manufactureWeapon(WeaponType weaponType) {
- return new ElfWeapon(weaponType);
- }
-
-}
+package com.iluwatar.factory.method;
+
+
+
+/**
+ *
+ * Concrete subclass for creating new objects.
+ *
+ */
+public class ElfBlacksmith implements Blacksmith {
+
+ @Override
+ public Weapon manufactureWeapon(WeaponType weaponType) {
+ return new ElfWeapon(weaponType);
+ }
+
+}
diff --git a/factory-method/src/main/java/com/iluwatar/ElfWeapon.java b/factory-method/src/main/java/com/iluwatar/factory/method/ElfWeapon.java
similarity index 85%
rename from factory-method/src/main/java/com/iluwatar/ElfWeapon.java
rename to factory-method/src/main/java/com/iluwatar/factory/method/ElfWeapon.java
index f1c3e6d5c5cf..37e4a9ce4fe4 100644
--- a/factory-method/src/main/java/com/iluwatar/ElfWeapon.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/ElfWeapon.java
@@ -1,16 +1,17 @@
-package com.iluwatar;
-
-public class ElfWeapon implements Weapon {
-
- private WeaponType weaponType;
-
- public ElfWeapon(WeaponType weaponType) {
- this.weaponType = weaponType;
- }
-
- @Override
- public String toString() {
- return "Elven " + weaponType;
- }
-
-}
+package com.iluwatar.factory.method;
+
+
+public class ElfWeapon implements Weapon {
+
+ private WeaponType weaponType;
+
+ public ElfWeapon(WeaponType weaponType) {
+ this.weaponType = weaponType;
+ }
+
+ @Override
+ public String toString() {
+ return "Elven " + weaponType;
+ }
+
+}
diff --git a/factory-method/src/main/java/com/iluwatar/OrcBlacksmith.java b/factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java
similarity index 80%
rename from factory-method/src/main/java/com/iluwatar/OrcBlacksmith.java
rename to factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java
index 60730d15f410..ac1c64364497 100644
--- a/factory-method/src/main/java/com/iluwatar/OrcBlacksmith.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java
@@ -1,14 +1,16 @@
-package com.iluwatar;
-
-/**
- *
- * Concrete subclass for creating new objects.
- *
- */
-public class OrcBlacksmith implements Blacksmith {
-
- public Weapon manufactureWeapon(WeaponType weaponType) {
- return new OrcWeapon(weaponType);
- }
-
-}
+package com.iluwatar.factory.method;
+
+
+/**
+ *
+ * Concrete subclass for creating new objects.
+ *
+ */
+public class OrcBlacksmith implements Blacksmith {
+
+ @Override
+ public Weapon manufactureWeapon(WeaponType weaponType) {
+ return new OrcWeapon(weaponType);
+ }
+
+}
diff --git a/factory-method/src/main/java/com/iluwatar/OrcWeapon.java b/factory-method/src/main/java/com/iluwatar/factory/method/OrcWeapon.java
similarity index 85%
rename from factory-method/src/main/java/com/iluwatar/OrcWeapon.java
rename to factory-method/src/main/java/com/iluwatar/factory/method/OrcWeapon.java
index 5ad59015846a..a0a505259057 100644
--- a/factory-method/src/main/java/com/iluwatar/OrcWeapon.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/OrcWeapon.java
@@ -1,16 +1,18 @@
-package com.iluwatar;
-
-public class OrcWeapon implements Weapon {
-
- private WeaponType weaponType;
-
- public OrcWeapon(WeaponType weaponType) {
- this.weaponType = weaponType;
- }
-
- @Override
- public String toString() {
- return "Orcish " + weaponType;
- }
-
-}
+package com.iluwatar.factory.method;
+
+
+
+public class OrcWeapon implements Weapon {
+
+ private WeaponType weaponType;
+
+ public OrcWeapon(WeaponType weaponType) {
+ this.weaponType = weaponType;
+ }
+
+ @Override
+ public String toString() {
+ return "Orcish " + weaponType;
+ }
+
+}
diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/Testsmith.java b/factory-method/src/main/java/com/iluwatar/factory/method/Testsmith.java
new file mode 100644
index 000000000000..6bc1af839dec
--- /dev/null
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/Testsmith.java
@@ -0,0 +1,16 @@
+package com.iluwatar.factory.method;
+
+
+/**
+ *
+ * Concrete subclass for creating new objects.
+ *
+ */
+public class Testsmith implements Blacksmith {
+
+ @Override
+ public Weapon manufactureWeapon(WeaponType weaponType) {
+ return new ElfWeapon(weaponType);
+ }
+
+}
diff --git a/factory-method/src/main/java/com/iluwatar/factory/method/Weapon.java b/factory-method/src/main/java/com/iluwatar/factory/method/Weapon.java
new file mode 100644
index 000000000000..80e7c911fb78
--- /dev/null
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/Weapon.java
@@ -0,0 +1,5 @@
+package com.iluwatar.factory.method;
+
+public interface Weapon {
+
+}
diff --git a/factory-method/src/main/java/com/iluwatar/WeaponType.java b/factory-method/src/main/java/com/iluwatar/factory/method/WeaponType.java
similarity index 70%
rename from factory-method/src/main/java/com/iluwatar/WeaponType.java
rename to factory-method/src/main/java/com/iluwatar/factory/method/WeaponType.java
index 72e01d82ceed..4ba4f4f47749 100644
--- a/factory-method/src/main/java/com/iluwatar/WeaponType.java
+++ b/factory-method/src/main/java/com/iluwatar/factory/method/WeaponType.java
@@ -1,19 +1,20 @@
-package com.iluwatar;
-
-public enum WeaponType {
-
- SHORT_SWORD, SPEAR, AXE;
-
- @Override
- public String toString() {
- String s = "";
- switch(this) {
- case SHORT_SWORD: s = "short sword"; break;
- case SPEAR: s = "spear"; break;
- case AXE: s = "axe"; break;
- }
- return s;
- }
-
-
-}
+package com.iluwatar.factory.method;
+
+public enum WeaponType {
+
+ SHORT_SWORD, SPEAR, AXE,TEST;
+
+ @Override
+ public String toString() {
+ String s = "";
+ switch(this) {
+ case SHORT_SWORD: s = "short sword"; break;
+ case SPEAR: s = "spear"; break;
+ case AXE: s = "axe"; break;
+ case TEST: s = "test"; break;
+ }
+ return s;
+ }
+
+
+}
diff --git a/factory-method/src/test/log4j.xml b/factory-method/src/test/log4j.xml
new file mode 100644
index 000000000000..748d0c1a5271
--- /dev/null
+++ b/factory-method/src/test/log4j.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/factory-method/src/test/resources/configure/UATApplicationContext.xml b/factory-method/src/test/resources/configure/UATApplicationContext.xml
new file mode 100644
index 000000000000..818ef52f909e
--- /dev/null
+++ b/factory-method/src/test/resources/configure/UATApplicationContext.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/factory-method/src/test/resources/configure/prop.xml b/factory-method/src/test/resources/configure/prop.xml
new file mode 100644
index 000000000000..c7afbd60d256
--- /dev/null
+++ b/factory-method/src/test/resources/configure/prop.xml
@@ -0,0 +1,133 @@
+
+
+ false
+
+
+ $JAVA_HOME
+ server
+ -server -Xmx768m -XX:PermSize=128m -XX:MaxPermSize=256m -Duser.timezone=GMT+8 -Djava.awt.headless=true
+ 8005
+
+ 80
+
+
+
+ true
+
+ StartTomcat
+ nc.bs.tomcat.startup.BootStrapTomcatService
+ 15
+ true
+ false
+ start|stop
+
+
+ EJB_SERVICE
+ nc.bs.mw.naming.EJBContainerService
+ 15
+ true
+ false
+ start|stop
+
+ nc.bs.mw.tran.IerpTransactionManagerProxy
+ nc.bs.mw.tran.IerpUserTransaction
+ nc.bs.mw.tran.IerpTransactionManager
+ nc.bs.mw.sql.UFSqlObject
+ nc.bs.mw.ejbsql.IerpXADataSource
+
+ design
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ baptest807
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ bafi
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ bafi
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ iufo6103312
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ iufo6103312
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ batm
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ batm
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ bap8
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ bap8
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ foodmart
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ foodmart
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
\ No newline at end of file
diff --git a/factory-method/src/test/resources/configure/test_data_source.xml b/factory-method/src/test/resources/configure/test_data_source.xml
new file mode 100644
index 000000000000..2e45d5ee869c
--- /dev/null
+++ b/factory-method/src/test/resources/configure/test_data_source.xml
@@ -0,0 +1,19 @@
+
+
+
+ design
+ Z
+ jdbc:sqlserver://uapxt02:1433;database=newwf_1010;sendStringParametersAsUnicode=false;responseBuffering=adaptive
+ sa
+ sasasa
+ com.microsoft.sqlserver.jdbc.SQLServerDriver
+ SQLSERVER2008
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
\ No newline at end of file
diff --git a/factory-method/src/test/resources/configure/uat.properties b/factory-method/src/test/resources/configure/uat.properties
new file mode 100644
index 000000000000..f0b076c2de77
--- /dev/null
+++ b/factory-method/src/test/resources/configure/uat.properties
@@ -0,0 +1,33 @@
+#project information
+app_name=App Name
+app_version=V6.5
+
+#Common Configure
+##UAPHOME path, USE '/' for path separator
+nc_home=
+##verify log path, USE '/' for path separator
+log_file=debug.log
+
+# 0 don't print app log information on test result log
+# 1 only print app log information on test result log for fail testcase
+# 2 print application log information on test result log for all testcase
+uatlog_switch=2
+
+#dataFile Configure ,backup database data and restore database data
+data_backup_file = c:/temp/datafile.xml
+
+#default datasource
+default_datasource=design
+
+#BusinessServer configure
+serverstart=off
+login_username=
+login_password=
+
+#resources settings
+nc_configure_dir=resources/configure/
+testdata_config_dir=resources/data/conf/
+testdata_springfile_dir=resources/data/spring/
+testdata_objectfile_dir=resources/data/object/
+testdata_excelfile_dir=resources/data/excel/
+testdata_backup_dir=resources/data/backup/
diff --git a/factory-method/src/test/resources/configure/uat_spring_conf.xml b/factory-method/src/test/resources/configure/uat_spring_conf.xml
new file mode 100644
index 000000000000..169a91514700
--- /dev/null
+++ b/factory-method/src/test/resources/configure/uat_spring_conf.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/factory-method/src/test/resources/data/backup/README b/factory-method/src/test/resources/data/backup/README
new file mode 100644
index 000000000000..a5b99861a7dc
--- /dev/null
+++ b/factory-method/src/test/resources/data/backup/README
@@ -0,0 +1 @@
+备份文件夹
\ No newline at end of file
diff --git a/factory-method/src/test/resources/data/config/README b/factory-method/src/test/resources/data/config/README
new file mode 100644
index 000000000000..4849e2aef709
--- /dev/null
+++ b/factory-method/src/test/resources/data/config/README
@@ -0,0 +1 @@
+Object配置文件夹
\ No newline at end of file
diff --git a/factory-method/src/test/resources/data/excel/README b/factory-method/src/test/resources/data/excel/README
new file mode 100644
index 000000000000..4849e2aef709
--- /dev/null
+++ b/factory-method/src/test/resources/data/excel/README
@@ -0,0 +1 @@
+Object配置文件夹
\ No newline at end of file
diff --git a/factory-method/src/test/resources/data/object/README b/factory-method/src/test/resources/data/object/README
new file mode 100644
index 000000000000..271c286f3687
--- /dev/null
+++ b/factory-method/src/test/resources/data/object/README
@@ -0,0 +1 @@
+固化结果文件夹
\ No newline at end of file
diff --git a/factory-method/src/test/resources/data/spring/README b/factory-method/src/test/resources/data/spring/README
new file mode 100644
index 000000000000..961ee7009fd2
--- /dev/null
+++ b/factory-method/src/test/resources/data/spring/README
@@ -0,0 +1 @@
+spring 配置文件夹
\ No newline at end of file
diff --git a/factory-method/src/test/resources/temp/README b/factory-method/src/test/resources/temp/README
new file mode 100644
index 000000000000..ccffba66ffdd
--- /dev/null
+++ b/factory-method/src/test/resources/temp/README
@@ -0,0 +1 @@
+临时文件夹
\ No newline at end of file
diff --git a/factory-method/src/test/testng.xml b/factory-method/src/test/testng.xml
new file mode 100644
index 000000000000..1fa0f7461a59
--- /dev/null
+++ b/factory-method/src/test/testng.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/flyweight/flyweight.iml b/flyweight/flyweight.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/flyweight/flyweight.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/flyweight/src/main/java/com/iluwatar/AlchemistShop.java b/flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java
similarity index 88%
rename from flyweight/src/main/java/com/iluwatar/AlchemistShop.java
rename to flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java
index 3d15668c891a..13823f0be437 100644
--- a/flyweight/src/main/java/com/iluwatar/AlchemistShop.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/AlchemistShop.java
@@ -1,57 +1,57 @@
-package com.iluwatar;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * The class that needs many objects.
- *
- */
-public class AlchemistShop {
-
- List topShelf;
- List bottomShelf;
-
- public AlchemistShop() {
- topShelf = new ArrayList<>();
- bottomShelf = new ArrayList<>();
- fillShelves();
- }
-
- private void fillShelves() {
-
- PotionFactory factory = new PotionFactory();
-
- topShelf.add(factory.createPotion(PotionType.INVISIBILITY));
- topShelf.add(factory.createPotion(PotionType.INVISIBILITY));
- topShelf.add(factory.createPotion(PotionType.STRENGTH));
- topShelf.add(factory.createPotion(PotionType.HEALING));
- topShelf.add(factory.createPotion(PotionType.INVISIBILITY));
- topShelf.add(factory.createPotion(PotionType.STRENGTH));
- topShelf.add(factory.createPotion(PotionType.HEALING));
- topShelf.add(factory.createPotion(PotionType.HEALING));
-
- bottomShelf.add(factory.createPotion(PotionType.POISON));
- bottomShelf.add(factory.createPotion(PotionType.POISON));
- bottomShelf.add(factory.createPotion(PotionType.POISON));
- bottomShelf.add(factory.createPotion(PotionType.HOLY_WATER));
- bottomShelf.add(factory.createPotion(PotionType.HOLY_WATER));
- }
-
- public void enumerate() {
-
- System.out.println("Enumerating top shelf potions\n");
-
- for (Potion p: topShelf) {
- p.drink();
- }
-
- System.out.println("\nEnumerating bottom shelf potions\n");
-
- for (Potion p: bottomShelf) {
- p.drink();
- }
-
- }
-}
+package com.iluwatar.flyweight;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * The class that needs many objects.
+ *
+ */
+public class AlchemistShop {
+
+ List topShelf;
+ List bottomShelf;
+
+ public AlchemistShop() {
+ topShelf = new ArrayList();
+ bottomShelf = new ArrayList();
+ fillShelves();
+ }
+
+ private void fillShelves() {
+
+ PotionFactory factory = new PotionFactory();
+
+ topShelf.add(factory.createPotion(PotionType.INVISIBILITY));
+ topShelf.add(factory.createPotion(PotionType.INVISIBILITY));
+ topShelf.add(factory.createPotion(PotionType.STRENGTH));
+ topShelf.add(factory.createPotion(PotionType.HEALING));
+ topShelf.add(factory.createPotion(PotionType.INVISIBILITY));
+ topShelf.add(factory.createPotion(PotionType.STRENGTH));
+ topShelf.add(factory.createPotion(PotionType.HEALING));
+ topShelf.add(factory.createPotion(PotionType.HEALING));
+
+ bottomShelf.add(factory.createPotion(PotionType.POISON));
+ bottomShelf.add(factory.createPotion(PotionType.POISON));
+ bottomShelf.add(factory.createPotion(PotionType.POISON));
+ bottomShelf.add(factory.createPotion(PotionType.HOLY_WATER));
+ bottomShelf.add(factory.createPotion(PotionType.HOLY_WATER));
+ }
+
+ public void enumerate() {
+
+ System.out.println("Enumerating top shelf potions\n");
+
+ for (Potion p: topShelf) {
+ p.drink();
+ }
+
+ System.out.println("\nEnumerating bottom shelf potions\n");
+
+ for (Potion p: bottomShelf) {
+ p.drink();
+ }
+
+ }
+}
diff --git a/flyweight/src/main/java/com/iluwatar/App.java b/flyweight/src/main/java/com/iluwatar/flyweight/App.java
similarity index 89%
rename from flyweight/src/main/java/com/iluwatar/App.java
rename to flyweight/src/main/java/com/iluwatar/flyweight/App.java
index d3b23dc867e7..c2b6dd3f6f91 100644
--- a/flyweight/src/main/java/com/iluwatar/App.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/App.java
@@ -1,17 +1,17 @@
-package com.iluwatar;
-
-/**
- *
- * Flyweight (PotionFactory) is useful when there is plethora of
- * objects (Potion). It provides means to decrease resource usage
- * by sharing object instances.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- AlchemistShop alchemistShop = new AlchemistShop();
- alchemistShop.enumerate();
- }
-}
+package com.iluwatar.flyweight;
+
+/**
+ *
+ * Flyweight (PotionFactory) is useful when there is plethora of
+ * objects (Potion). It provides means to decrease resource usage
+ * by sharing object instances.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ AlchemistShop alchemistShop = new AlchemistShop();
+ alchemistShop.enumerate();
+ }
+}
diff --git a/flyweight/src/main/java/com/iluwatar/HealingPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/HealingPotion.java
similarity index 84%
rename from flyweight/src/main/java/com/iluwatar/HealingPotion.java
rename to flyweight/src/main/java/com/iluwatar/flyweight/HealingPotion.java
index 944dea751e37..e2da1048fb97 100644
--- a/flyweight/src/main/java/com/iluwatar/HealingPotion.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/HealingPotion.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public class HealingPotion implements Potion {
-
- @Override
- public void drink() {
- System.out.println("You feel healed. (Potion=" + System.identityHashCode(this) + ")");
- }
-
-}
+package com.iluwatar.flyweight;
+
+public class HealingPotion implements Potion {
+
+ @Override
+ public void drink() {
+ System.out.println("You feel healed. (Potion=" + System.identityHashCode(this) + ")");
+ }
+
+}
diff --git a/flyweight/src/main/java/com/iluwatar/HolyWaterPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/HolyWaterPotion.java
similarity index 84%
rename from flyweight/src/main/java/com/iluwatar/HolyWaterPotion.java
rename to flyweight/src/main/java/com/iluwatar/flyweight/HolyWaterPotion.java
index 27b185a9467e..de33a716f0f9 100644
--- a/flyweight/src/main/java/com/iluwatar/HolyWaterPotion.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/HolyWaterPotion.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public class HolyWaterPotion implements Potion {
-
- @Override
- public void drink() {
- System.out.println("You feel blessed. (Potion=" + System.identityHashCode(this) + ")");
- }
-
-}
+package com.iluwatar.flyweight;
+
+public class HolyWaterPotion implements Potion {
+
+ @Override
+ public void drink() {
+ System.out.println("You feel blessed. (Potion=" + System.identityHashCode(this) + ")");
+ }
+
+}
diff --git a/flyweight/src/main/java/com/iluwatar/InvisibilityPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/InvisibilityPotion.java
similarity index 85%
rename from flyweight/src/main/java/com/iluwatar/InvisibilityPotion.java
rename to flyweight/src/main/java/com/iluwatar/flyweight/InvisibilityPotion.java
index 7796b5bebe6e..40a9b69554e2 100644
--- a/flyweight/src/main/java/com/iluwatar/InvisibilityPotion.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/InvisibilityPotion.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public class InvisibilityPotion implements Potion {
-
- @Override
- public void drink() {
- System.out.println("You become invisible. (Potion=" + System.identityHashCode(this) + ")");
- }
-
-}
+package com.iluwatar.flyweight;
+
+public class InvisibilityPotion implements Potion {
+
+ @Override
+ public void drink() {
+ System.out.println("You become invisible. (Potion=" + System.identityHashCode(this) + ")");
+ }
+
+}
diff --git a/flyweight/src/main/java/com/iluwatar/PoisonPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/PoisonPotion.java
similarity index 85%
rename from flyweight/src/main/java/com/iluwatar/PoisonPotion.java
rename to flyweight/src/main/java/com/iluwatar/flyweight/PoisonPotion.java
index 728b0d00b1be..cc7e5d0d3141 100644
--- a/flyweight/src/main/java/com/iluwatar/PoisonPotion.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/PoisonPotion.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public class PoisonPotion implements Potion {
-
- @Override
- public void drink() {
- System.out.println("Urgh! This is poisonous. (Potion=" + System.identityHashCode(this) + ")");
- }
-
-}
+package com.iluwatar.flyweight;
+
+public class PoisonPotion implements Potion {
+
+ @Override
+ public void drink() {
+ System.out.println("Urgh! This is poisonous. (Potion=" + System.identityHashCode(this) + ")");
+ }
+
+}
diff --git a/flyweight/src/main/java/com/iluwatar/Potion.java b/flyweight/src/main/java/com/iluwatar/flyweight/Potion.java
similarity index 73%
rename from flyweight/src/main/java/com/iluwatar/Potion.java
rename to flyweight/src/main/java/com/iluwatar/flyweight/Potion.java
index 91cfabe3a1e9..b76e7b4e52ab 100644
--- a/flyweight/src/main/java/com/iluwatar/Potion.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/Potion.java
@@ -1,12 +1,12 @@
-package com.iluwatar;
-
-/**
- *
- * Interface for objects.
- *
- */
-public interface Potion {
-
- public void drink();
-
-}
+package com.iluwatar.flyweight;
+
+/**
+ *
+ * Interface for objects.
+ *
+ */
+public interface Potion {
+
+ public void drink();
+
+}
diff --git a/flyweight/src/main/java/com/iluwatar/PotionFactory.java b/flyweight/src/main/java/com/iluwatar/flyweight/PotionFactory.java
similarity index 86%
rename from flyweight/src/main/java/com/iluwatar/PotionFactory.java
rename to flyweight/src/main/java/com/iluwatar/flyweight/PotionFactory.java
index d1eb09a74a14..0ea48e01bd98 100644
--- a/flyweight/src/main/java/com/iluwatar/PotionFactory.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/PotionFactory.java
@@ -1,49 +1,49 @@
-package com.iluwatar;
-
-import java.util.EnumMap;
-
-/**
- *
- * Flyweight.
- *
- */
-public class PotionFactory {
-
- private EnumMap potions;
-
- public PotionFactory() {
- potions = new EnumMap<>(PotionType.class);
- }
-
- Potion createPotion(PotionType type) {
- Potion potion = potions.get(type);
- if (potion == null) {
- switch (type) {
- case HEALING:
- potion = new HealingPotion();
- potions.put(type, potion);
- break;
- case HOLY_WATER:
- potion = new HolyWaterPotion();
- potions.put(type, potion);
- break;
- case INVISIBILITY:
- potion = new InvisibilityPotion();
- potions.put(type, potion);
- break;
- case POISON:
- potion = new PoisonPotion();
- potions.put(type, potion);
- break;
- case STRENGTH:
- potion = new StrengthPotion();
- potions.put(type, potion);
- break;
- default:
- break;
- }
- }
- return potion;
- }
-
-}
+package com.iluwatar.flyweight;
+
+import java.util.EnumMap;
+
+/**
+ *
+ * Flyweight.
+ *
+ */
+public class PotionFactory {
+
+ private EnumMap potions;
+
+ public PotionFactory() {
+ potions = new EnumMap(PotionType.class);
+ }
+
+ Potion createPotion(PotionType type) {
+ Potion potion = potions.get(type);
+ if (potion == null) {
+ switch (type) {
+ case HEALING:
+ potion = new HealingPotion();
+ potions.put(type, potion);
+ break;
+ case HOLY_WATER:
+ potion = new HolyWaterPotion();
+ potions.put(type, potion);
+ break;
+ case INVISIBILITY:
+ potion = new InvisibilityPotion();
+ potions.put(type, potion);
+ break;
+ case POISON:
+ potion = new PoisonPotion();
+ potions.put(type, potion);
+ break;
+ case STRENGTH:
+ potion = new StrengthPotion();
+ potions.put(type, potion);
+ break;
+ default:
+ break;
+ }
+ }
+ return potion;
+ }
+
+}
diff --git a/flyweight/src/main/java/com/iluwatar/PotionType.java b/flyweight/src/main/java/com/iluwatar/flyweight/PotionType.java
similarity index 72%
rename from flyweight/src/main/java/com/iluwatar/PotionType.java
rename to flyweight/src/main/java/com/iluwatar/flyweight/PotionType.java
index ff4e392c9f26..38c5a3a53c79 100644
--- a/flyweight/src/main/java/com/iluwatar/PotionType.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/PotionType.java
@@ -1,11 +1,11 @@
-package com.iluwatar;
-
-public enum PotionType {
-
- HEALING,
- INVISIBILITY,
- STRENGTH,
- HOLY_WATER,
- POISON;
-
-}
+package com.iluwatar.flyweight;
+
+public enum PotionType {
+
+ HEALING,
+ INVISIBILITY,
+ STRENGTH,
+ HOLY_WATER,
+ POISON;
+
+}
diff --git a/flyweight/src/main/java/com/iluwatar/StrengthPotion.java b/flyweight/src/main/java/com/iluwatar/flyweight/StrengthPotion.java
similarity index 84%
rename from flyweight/src/main/java/com/iluwatar/StrengthPotion.java
rename to flyweight/src/main/java/com/iluwatar/flyweight/StrengthPotion.java
index 0709b5b53116..d69bb90974ab 100644
--- a/flyweight/src/main/java/com/iluwatar/StrengthPotion.java
+++ b/flyweight/src/main/java/com/iluwatar/flyweight/StrengthPotion.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public class StrengthPotion implements Potion {
-
- @Override
- public void drink() {
- System.out.println("You feel strong. (Potion=" + System.identityHashCode(this) + ")");
- }
-
-}
+package com.iluwatar.flyweight;
+
+public class StrengthPotion implements Potion {
+
+ @Override
+ public void drink() {
+ System.out.println("You feel strong. (Potion=" + System.identityHashCode(this) + ")");
+ }
+
+}
diff --git a/interpreter/interpreter.iml b/interpreter/interpreter.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/interpreter/interpreter.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/interpreter/src/main/java/com/iluwatar/App.java b/interpreter/src/main/java/com/iluwatar/interpreter/App.java
similarity index 76%
rename from interpreter/src/main/java/com/iluwatar/App.java
rename to interpreter/src/main/java/com/iluwatar/interpreter/App.java
index ce2d6b520d29..efd9b3f9421d 100644
--- a/interpreter/src/main/java/com/iluwatar/App.java
+++ b/interpreter/src/main/java/com/iluwatar/interpreter/App.java
@@ -1,67 +1,68 @@
-package com.iluwatar;
-
-import java.util.Stack;
-
-/**
- *
- * Interpreter pattern breaks sentences into expressions (Expression)
- * that can be evaluated and as a whole form the result.
- *
- */
-public class App
-{
-
- /**
- *
- * Expressions can be evaluated using prefix, infix or postfix notations
- * This sample uses postfix, where operator comes after the operands
- *
- */
- public static void main( String[] args )
- {
- String tokenString = "4 3 2 - 1 + *";
- Stack stack = new Stack<>();
-
- String[] tokenList = tokenString.split(" ");
- for (String s : tokenList) {
- if (isOperator(s)) {
- Expression rightExpression = stack.pop();
- Expression leftExpression = stack.pop();
- System.out.println(String.format("popped from stack left: %d right: %d",
- leftExpression.interpret(), rightExpression.interpret()));
- Expression operator = getOperatorInstance(s, leftExpression,
- rightExpression);
- System.out.println(String.format("operator: %s", operator));
- int result = operator.interpret();
- NumberExpression resultExpression = new NumberExpression(result);
- stack.push(resultExpression);
- System.out.println(String.format("push result to stack: %d", resultExpression.interpret()));
- } else {
- Expression i = new NumberExpression(s);
- stack.push(i);
- System.out.println(String.format("push to stack: %d", i.interpret()));
- }
- }
- System.out.println(String.format("result: %d", stack.pop().interpret()));
- }
-
- public static boolean isOperator(String s) {
- if (s.equals("+") || s.equals("-") || s.equals("*"))
- return true;
- else
- return false;
- }
-
- public static Expression getOperatorInstance(String s, Expression left,
- Expression right) {
- switch (s) {
- case "+":
- return new PlusExpression(left, right);
- case "-":
- return new MinusExpression(left, right);
- case "*":
- return new MultiplyExpression(left, right);
- }
- return null;
- }
-}
+package com.iluwatar.interpreter;
+
+import java.util.Stack;
+
+/**
+ *
+ * Interpreter pattern breaks sentences into expressions (Expression)
+ * that can be evaluated and as a whole form the result.
+ *
+ */
+public class App
+{
+
+ /**
+ *
+ * Expressions can be evaluated using prefix, infix or postfix notations
+ * This sample uses postfix, where operator comes after the operands
+ *
+ */
+ public static void main( String[] args )
+ {
+ String tokenString = "4 3 2 - 1 + *";
+ Stack stack = new Stack();
+
+ String[] tokenList = tokenString.split(" ");
+ for (String s : tokenList) {
+ if (isOperator(s)) {
+ Expression rightExpression = stack.pop();
+ Expression leftExpression = stack.pop();
+ System.out.println(String.format("popped from stack left: %d right: %d",
+ leftExpression.interpret(), rightExpression.interpret()));
+ Expression operator = getOperatorInstance(s, leftExpression,
+ rightExpression);
+ System.out.println(String.format("operator: %s", operator));
+ int result = operator.interpret();
+ NumberExpression resultExpression = new NumberExpression(result);
+ stack.push(resultExpression);
+ System.out.println(String.format("push result to stack: %d", resultExpression.interpret()));
+ } else {
+ Expression i = new NumberExpression(s);
+ stack.push(i);
+ System.out.println(String.format("push to stack: %d", i.interpret()));
+ }
+ }
+ System.out.println(String.format("result: %d", stack.pop().interpret()));
+ }
+
+ public static boolean isOperator(String s) {
+ if (s.equals("+") || s.equals("-") || s.equals("*")) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public static Expression getOperatorInstance(String s, Expression left,
+ Expression right) {
+ if ("+".equals(s)) {
+ return new PlusExpression(left, right);
+ } else if ("-".equals(s)) {
+ return new MinusExpression(left, right);
+ } else if ("*".equals(s)) {
+ return new MultiplyExpression(left, right);
+ }
+
+ return null;
+ }
+}
diff --git a/interpreter/src/main/java/com/iluwatar/Expression.java b/interpreter/src/main/java/com/iluwatar/interpreter/Expression.java
similarity index 78%
rename from interpreter/src/main/java/com/iluwatar/Expression.java
rename to interpreter/src/main/java/com/iluwatar/interpreter/Expression.java
index 28fbce6fd71d..922807274c30 100644
--- a/interpreter/src/main/java/com/iluwatar/Expression.java
+++ b/interpreter/src/main/java/com/iluwatar/interpreter/Expression.java
@@ -1,9 +1,9 @@
-package com.iluwatar;
-
-public abstract class Expression {
-
- public abstract int interpret();
-
- @Override
- public abstract String toString();
-}
+package com.iluwatar.interpreter;
+
+public abstract class Expression {
+
+ public abstract int interpret();
+
+ @Override
+ public abstract String toString();
+}
diff --git a/interpreter/src/main/java/com/iluwatar/MinusExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java
similarity index 91%
rename from interpreter/src/main/java/com/iluwatar/MinusExpression.java
rename to interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java
index 8025020fcb49..c344daf5f400 100644
--- a/interpreter/src/main/java/com/iluwatar/MinusExpression.java
+++ b/interpreter/src/main/java/com/iluwatar/interpreter/MinusExpression.java
@@ -1,23 +1,23 @@
-package com.iluwatar;
-
-public class MinusExpression extends Expression {
-
- private Expression leftExpression;
- private Expression rightExpression;
-
- public MinusExpression(Expression leftExpression, Expression rightExpression) {
- this.leftExpression = leftExpression;
- this.rightExpression = rightExpression;
- }
-
- @Override
- public int interpret() {
- return leftExpression.interpret() - rightExpression.interpret();
- }
-
- @Override
- public String toString() {
- return "-";
- }
-
-}
+package com.iluwatar.interpreter;
+
+public class MinusExpression extends Expression {
+
+ private Expression leftExpression;
+ private Expression rightExpression;
+
+ public MinusExpression(Expression leftExpression, Expression rightExpression) {
+ this.leftExpression = leftExpression;
+ this.rightExpression = rightExpression;
+ }
+
+ @Override
+ public int interpret() {
+ return leftExpression.interpret() - rightExpression.interpret();
+ }
+
+ @Override
+ public String toString() {
+ return "-";
+ }
+
+}
diff --git a/interpreter/src/main/java/com/iluwatar/MultiplyExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java
similarity index 91%
rename from interpreter/src/main/java/com/iluwatar/MultiplyExpression.java
rename to interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java
index 15e1a1d9e282..6fa02f67ba47 100644
--- a/interpreter/src/main/java/com/iluwatar/MultiplyExpression.java
+++ b/interpreter/src/main/java/com/iluwatar/interpreter/MultiplyExpression.java
@@ -1,23 +1,23 @@
-package com.iluwatar;
-
-public class MultiplyExpression extends Expression {
-
- private Expression leftExpression;
- private Expression rightExpression;
-
- public MultiplyExpression(Expression leftExpression, Expression rightExpression) {
- this.leftExpression = leftExpression;
- this.rightExpression = rightExpression;
- }
-
- @Override
- public int interpret() {
- return leftExpression.interpret() * rightExpression.interpret();
- }
-
- @Override
- public String toString() {
- return "*";
- }
-
-}
+package com.iluwatar.interpreter;
+
+public class MultiplyExpression extends Expression {
+
+ private Expression leftExpression;
+ private Expression rightExpression;
+
+ public MultiplyExpression(Expression leftExpression, Expression rightExpression) {
+ this.leftExpression = leftExpression;
+ this.rightExpression = rightExpression;
+ }
+
+ @Override
+ public int interpret() {
+ return leftExpression.interpret() * rightExpression.interpret();
+ }
+
+ @Override
+ public String toString() {
+ return "*";
+ }
+
+}
diff --git a/interpreter/src/main/java/com/iluwatar/NumberExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java
similarity index 87%
rename from interpreter/src/main/java/com/iluwatar/NumberExpression.java
rename to interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java
index 0e818f3368bc..104fd39f5b3d 100644
--- a/interpreter/src/main/java/com/iluwatar/NumberExpression.java
+++ b/interpreter/src/main/java/com/iluwatar/interpreter/NumberExpression.java
@@ -1,25 +1,25 @@
-package com.iluwatar;
-
-public class NumberExpression extends Expression {
-
- private int number;
-
- public NumberExpression(int number) {
- this.number = number;
- }
-
- public NumberExpression(String s) {
- this.number = Integer.parseInt(s);
- }
-
- @Override
- public int interpret() {
- return number;
- }
-
- @Override
- public String toString() {
- return "number";
- }
-
-}
+package com.iluwatar.interpreter;
+
+public class NumberExpression extends Expression {
+
+ private int number;
+
+ public NumberExpression(int number) {
+ this.number = number;
+ }
+
+ public NumberExpression(String s) {
+ this.number = Integer.parseInt(s);
+ }
+
+ @Override
+ public int interpret() {
+ return number;
+ }
+
+ @Override
+ public String toString() {
+ return "number";
+ }
+
+}
diff --git a/interpreter/src/main/java/com/iluwatar/PlusExpression.java b/interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java
similarity index 91%
rename from interpreter/src/main/java/com/iluwatar/PlusExpression.java
rename to interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java
index de090c3320c0..22d8d09d27e6 100644
--- a/interpreter/src/main/java/com/iluwatar/PlusExpression.java
+++ b/interpreter/src/main/java/com/iluwatar/interpreter/PlusExpression.java
@@ -1,23 +1,23 @@
-package com.iluwatar;
-
-public class PlusExpression extends Expression {
-
- private Expression leftExpression;
- private Expression rightExpression;
-
- public PlusExpression(Expression leftExpression, Expression rightExpression) {
- this.leftExpression = leftExpression;
- this.rightExpression = rightExpression;
- }
-
- @Override
- public int interpret() {
- return leftExpression.interpret() + rightExpression.interpret();
- }
-
- @Override
- public String toString() {
- return "+";
- }
-
-}
+package com.iluwatar.interpreter;
+
+public class PlusExpression extends Expression {
+
+ private Expression leftExpression;
+ private Expression rightExpression;
+
+ public PlusExpression(Expression leftExpression, Expression rightExpression) {
+ this.leftExpression = leftExpression;
+ this.rightExpression = rightExpression;
+ }
+
+ @Override
+ public int interpret() {
+ return leftExpression.interpret() + rightExpression.interpret();
+ }
+
+ @Override
+ public String toString() {
+ return "+";
+ }
+
+}
diff --git a/iterator/iterator.iml b/iterator/iterator.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/iterator/iterator.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/iterator/src/main/java/com/iluwatar/App.java b/iterator/src/main/java/com/iluwatar/iterator/App.java
similarity index 94%
rename from iterator/src/main/java/com/iluwatar/App.java
rename to iterator/src/main/java/com/iluwatar/iterator/App.java
index 0ee92de1bc74..4c706486509c 100644
--- a/iterator/src/main/java/com/iluwatar/App.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/App.java
@@ -1,42 +1,42 @@
-package com.iluwatar;
-
-/**
- *
- * Iterator (ItemIterator) adds abstraction layer on top of a
- * collection (TreasureChest). This way the collection can change
- * its internal implementation without affecting its clients.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- TreasureChest chest = new TreasureChest();
-
- ItemIterator ringIterator = chest.Iterator(ItemType.RING);
- while (ringIterator.hasNext()) {
- System.out.println(ringIterator.next());
- }
-
- System.out.println("----------");
-
- ItemIterator potionIterator = chest.Iterator(ItemType.POTION);
- while (potionIterator.hasNext()) {
- System.out.println(potionIterator.next());
- }
-
- System.out.println("----------");
-
- ItemIterator weaponIterator = chest.Iterator(ItemType.WEAPON);
- while (weaponIterator.hasNext()) {
- System.out.println(weaponIterator.next());
- }
-
- System.out.println("----------");
-
- ItemIterator it = chest.Iterator(ItemType.ANY);
- while (it.hasNext()) {
- System.out.println(it.next());
- }
- }
-}
+package com.iluwatar.iterator;
+
+/**
+ *
+ * Iterator (ItemIterator) adds abstraction layer on top of a
+ * collection (TreasureChest). This way the collection can change
+ * its internal implementation without affecting its clients.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ TreasureChest chest = new TreasureChest();
+
+ ItemIterator ringIterator = chest.Iterator(ItemType.RING);
+ while (ringIterator.hasNext()) {
+ System.out.println(ringIterator.next());
+ }
+
+ System.out.println("----------");
+
+ ItemIterator potionIterator = chest.Iterator(ItemType.POTION);
+ while (potionIterator.hasNext()) {
+ System.out.println(potionIterator.next());
+ }
+
+ System.out.println("----------");
+
+ ItemIterator weaponIterator = chest.Iterator(ItemType.WEAPON);
+ while (weaponIterator.hasNext()) {
+ System.out.println(weaponIterator.next());
+ }
+
+ System.out.println("----------");
+
+ ItemIterator it = chest.Iterator(ItemType.ANY);
+ while (it.hasNext()) {
+ System.out.println(it.next());
+ }
+ }
+}
diff --git a/iterator/src/main/java/com/iluwatar/Item.java b/iterator/src/main/java/com/iluwatar/iterator/Item.java
similarity index 87%
rename from iterator/src/main/java/com/iluwatar/Item.java
rename to iterator/src/main/java/com/iluwatar/iterator/Item.java
index f7a3b7661e74..41109bb3ed22 100644
--- a/iterator/src/main/java/com/iluwatar/Item.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/Item.java
@@ -1,25 +1,25 @@
-package com.iluwatar;
-
-public class Item {
-
- private ItemType type;
- private String name;
-
- public Item(ItemType type, String name) {
- this.setType(type);
- this.name = name;
- }
-
- @Override
- public String toString() {
- return name;
- }
-
- public ItemType getType() {
- return type;
- }
-
- public void setType(ItemType type) {
- this.type = type;
- }
-}
+package com.iluwatar.iterator;
+
+public class Item {
+
+ private ItemType type;
+ private String name;
+
+ public Item(ItemType type, String name) {
+ this.setType(type);
+ this.name = name;
+ }
+
+ @Override
+ public String toString() {
+ return name;
+ }
+
+ public ItemType getType() {
+ return type;
+ }
+
+ public void setType(ItemType type) {
+ this.type = type;
+ }
+}
diff --git a/iterator/src/main/java/com/iluwatar/ItemIterator.java b/iterator/src/main/java/com/iluwatar/iterator/ItemIterator.java
similarity index 71%
rename from iterator/src/main/java/com/iluwatar/ItemIterator.java
rename to iterator/src/main/java/com/iluwatar/iterator/ItemIterator.java
index 1a6da1cd46a3..b56c0ed24de8 100644
--- a/iterator/src/main/java/com/iluwatar/ItemIterator.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/ItemIterator.java
@@ -1,13 +1,15 @@
-package com.iluwatar;
-
-/**
- *
- * Iterator interface.
- *
- */
-public interface ItemIterator {
-
- boolean hasNext();
-
- Item next();
-}
+package com.iluwatar.iterator;
+
+
+
+/**
+ *
+ * Iterator interface.
+ *
+ */
+public interface ItemIterator {
+
+ boolean hasNext();
+
+ Item next();
+}
diff --git a/iterator/src/main/java/com/iluwatar/ItemType.java b/iterator/src/main/java/com/iluwatar/iterator/ItemType.java
similarity index 64%
rename from iterator/src/main/java/com/iluwatar/ItemType.java
rename to iterator/src/main/java/com/iluwatar/iterator/ItemType.java
index 905179417e35..508cb7f2b810 100644
--- a/iterator/src/main/java/com/iluwatar/ItemType.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/ItemType.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public enum ItemType {
-
- ANY,
- WEAPON,
- RING,
- POTION
-
-}
+package com.iluwatar.iterator;
+
+public enum ItemType {
+
+ ANY,
+ WEAPON,
+ RING,
+ POTION
+
+}
diff --git a/iterator/src/main/java/com/iluwatar/TreasureChest.java b/iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java
similarity index 86%
rename from iterator/src/main/java/com/iluwatar/TreasureChest.java
rename to iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java
index 7cc80e7ffdd5..edddb6bc40ab 100644
--- a/iterator/src/main/java/com/iluwatar/TreasureChest.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/TreasureChest.java
@@ -1,39 +1,41 @@
-package com.iluwatar;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * Collection class.
- *
- */
-public class TreasureChest {
-
- private List
- items;
-
- public TreasureChest() {
- items = new ArrayList<>();
- items.add(new Item(ItemType.POTION, "Potion of courage"));
- items.add(new Item(ItemType.RING, "Ring of shadows"));
- items.add(new Item(ItemType.POTION, "Potion of wisdom"));
- items.add(new Item(ItemType.POTION, "Potion of blood"));
- items.add(new Item(ItemType.WEAPON, "Sword of silver +1"));
- items.add(new Item(ItemType.POTION, "Potion of rust"));
- items.add(new Item(ItemType.POTION, "Potion of healing"));
- items.add(new Item(ItemType.RING, "Ring of armor"));
- items.add(new Item(ItemType.WEAPON, "Steel halberd"));
- items.add(new Item(ItemType.WEAPON, "Dagger of poison"));
- }
-
- ItemIterator Iterator(ItemType type) {
- return new TreasureChestItemIterator(this, type);
- }
-
- public List
- getItems() {
- ArrayList
- list = new ArrayList<>();
- list.addAll(items);
- return list;
- }
-
-}
+package com.iluwatar.iterator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+/**
+ *
+ * Collection class.
+ *
+ */
+public class TreasureChest {
+
+ private List
- items;
+
+ public TreasureChest() {
+ items = new ArrayList
- ();
+ items.add(new Item(ItemType.POTION, "Potion of courage"));
+ items.add(new Item(ItemType.RING, "Ring of shadows"));
+ items.add(new Item(ItemType.POTION, "Potion of wisdom"));
+ items.add(new Item(ItemType.POTION, "Potion of blood"));
+ items.add(new Item(ItemType.WEAPON, "Sword of silver +1"));
+ items.add(new Item(ItemType.POTION, "Potion of rust"));
+ items.add(new Item(ItemType.POTION, "Potion of healing"));
+ items.add(new Item(ItemType.RING, "Ring of armor"));
+ items.add(new Item(ItemType.WEAPON, "Steel halberd"));
+ items.add(new Item(ItemType.WEAPON, "Dagger of poison"));
+ }
+
+ ItemIterator Iterator(ItemType type) {
+ return new TreasureChestItemIterator(this, type);
+ }
+
+ public List
- getItems() {
+ ArrayList
- list = new ArrayList
- ();
+ list.addAll(items);
+ return list;
+ }
+
+}
diff --git a/iterator/src/main/java/com/iluwatar/TreasureChestItemIterator.java b/iterator/src/main/java/com/iluwatar/iterator/TreasureChestItemIterator.java
similarity index 89%
rename from iterator/src/main/java/com/iluwatar/TreasureChestItemIterator.java
rename to iterator/src/main/java/com/iluwatar/iterator/TreasureChestItemIterator.java
index 01e089b08798..e02073bc35fe 100644
--- a/iterator/src/main/java/com/iluwatar/TreasureChestItemIterator.java
+++ b/iterator/src/main/java/com/iluwatar/iterator/TreasureChestItemIterator.java
@@ -1,48 +1,50 @@
-package com.iluwatar;
-
-import java.util.List;
-
-public class TreasureChestItemIterator implements ItemIterator {
-
- private TreasureChest chest;
- private int idx;
- private ItemType type;
-
- public TreasureChestItemIterator(TreasureChest chest, ItemType type) {
- this.chest = chest;
- this.type = type;
- this.idx = -1;
- }
-
- @Override
- public boolean hasNext() {
- return findNextIdx() != -1;
- }
-
- @Override
- public Item next() {
- idx = findNextIdx();
- if (idx != -1) {
- return chest.getItems().get(idx);
- }
- return null;
- }
-
- private int findNextIdx() {
-
- List
- items = chest.getItems();
- boolean found = false;
- int tempIdx = idx;
- while (!found) {
- tempIdx++;
- if (tempIdx >= items.size()) {
- tempIdx = -1;
- break;
- }
- if (type.equals(ItemType.ANY) || items.get(tempIdx).getType().equals(type)) {
- break;
- }
- }
- return tempIdx;
- }
-}
+package com.iluwatar.iterator;
+
+import java.util.List;
+
+
+
+public class TreasureChestItemIterator implements ItemIterator {
+
+ private TreasureChest chest;
+ private int idx;
+ private ItemType type;
+
+ public TreasureChestItemIterator(TreasureChest chest, ItemType type) {
+ this.chest = chest;
+ this.type = type;
+ idx = -1;
+ }
+
+ @Override
+ public boolean hasNext() {
+ return findNextIdx() != -1;
+ }
+
+ @Override
+ public Item next() {
+ idx = findNextIdx();
+ if (idx != -1) {
+ return chest.getItems().get(idx);
+ }
+ return null;
+ }
+
+ private int findNextIdx() {
+
+ List
- items = chest.getItems();
+ boolean found = false;
+ int tempIdx = idx;
+ while (!found) {
+ tempIdx++;
+ if (tempIdx >= items.size()) {
+ tempIdx = -1;
+ break;
+ }
+ if (type.equals(ItemType.ANY) || items.get(tempIdx).getType().equals(type)) {
+ break;
+ }
+ }
+ return tempIdx;
+ }
+}
diff --git a/lambda/pom.xml b/lambda/pom.xml
new file mode 100644
index 000000000000..f56729207b3b
--- /dev/null
+++ b/lambda/pom.xml
@@ -0,0 +1,27 @@
+
+ 4.0.0
+
+ com.iluwatar
+ java-design-patterns
+ 1.0-SNAPSHOT
+
+ lambda
+ lambda
+
+
+
+ cglib
+ cglib
+ 3.2.5
+
+
+
+ org.mybatis
+ mybatis
+ 3.2.1
+
+
+
+
+
\ No newline at end of file
diff --git a/lambda/src/main/java/com/iluwatar/lambda/LRUCache.java b/lambda/src/main/java/com/iluwatar/lambda/LRUCache.java
new file mode 100644
index 000000000000..109345fcc2a8
--- /dev/null
+++ b/lambda/src/main/java/com/iluwatar/lambda/LRUCache.java
@@ -0,0 +1,48 @@
+package com.iluwatar.lambda;
+/**
+ * LRU缂撳瓨
+ * @author duanmenghua
+ *
+ */
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Random;
+
+public class LRUCache {
+
+ private static Integer cacheSize = 5;
+
+ static LinkedHashMap cache = new LinkedHashMap(cacheSize, 0.75f, true) {
+ private static final long serialVersionUID = 4389287907499075284L;
+ protected boolean removeEldestEntry(Map.Entry eldest) {
+
+ if (size()>cacheSize) {
+ System.out.println(cache.keySet());
+ System.out.println("to remove key: "+ eldest.getKey()+ " value: "+eldest.getValue());
+ return true;
+ }
+
+ return false;
+ }
+
+ };
+
+ public static void main(String[] args) throws InterruptedException {
+ while(true) {
+ if (cache.size()>=cacheSize) {
+ Integer key = cache.keySet().stream().findFirst().get();
+ System.out.println("get value: key: "+ key+" value: "+cache.get(key));
+ }
+
+ int nextKey = new Random(System.nanoTime()).nextInt(10);
+ String value = "test";
+ cache.put(nextKey, value);
+ System.out.println("put value: key: "+ nextKey+" value: "+value);
+ System.out.println(cache.keySet());
+ Thread.sleep(2000);
+
+ }
+ }
+
+}
diff --git a/lambda/src/main/java/com/iluwatar/lambda/Lambda.java b/lambda/src/main/java/com/iluwatar/lambda/Lambda.java
new file mode 100644
index 000000000000..678bb4f81061
--- /dev/null
+++ b/lambda/src/main/java/com/iluwatar/lambda/Lambda.java
@@ -0,0 +1,65 @@
+package com.iluwatar.lambda;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Random;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+/**
+ * Created by duanmenghua on 2017-07-24.
+ */
+public class Lambda {
+ public static void main(String[] args) {
+
+// List result = new LinkedList<>();
+// result.add(1);
+// result.add(3);
+// result.add(4);
+// result.add(7);
+// result.add(5);
+// result.add(7);
+// List collect = result.stream().filter(x -> x > 3).distinct().collect(Collectors.toList());
+// Collections.sort(collect, (x,y)-> {return y-x;});
+// System.out.println(collect);
+// collect.forEach(System.out::println);
+// System.out.println("predicate");
+// evaluate(collect, n->n<=5);
+// Integer reduce = collect.stream().map(x->x*x).reduce((x,y)->x+y).get();
+// System.out.println(collect);
+ compare();
+ }
+
+ public static void evaluate(List list, Predicate predicate) {
+ list.forEach((x)->{if(predicate.test(x)) System.out.print(x+" ");});
+ }
+ public static void compare() {
+ List values = new LinkedList<>();
+ for (int i = 0; i < 50000000; i++) {
+ Random random = new Random(System.currentTimeMillis());
+ values.add(random.nextInt());
+ }
+ int max = Integer.MIN_VALUE;
+ long start = System.currentTimeMillis();
+ System.out.println("for start ");
+ for (Integer integer : values) {
+ if (integer > max) {
+ max = integer;
+ }
+ }
+ long end = System.currentTimeMillis();
+
+ System.out.println("max is: "+max);
+ System.out.println("for start "+(end-start)*1.0/1000);
+ max = Integer.MIN_VALUE;
+ max = values.stream().reduce(Integer.MIN_VALUE,Math::max);
+ long last = System.currentTimeMillis();
+ System.out.println("max is: "+max);
+ System.out.println("for start "+(last-end)*1.0/1000);
+
+
+ }
+
+}
diff --git a/lambda/src/main/java/com/iluwatar/proxy/HelloService.java b/lambda/src/main/java/com/iluwatar/proxy/HelloService.java
new file mode 100644
index 000000000000..b7f28e8f8d8c
--- /dev/null
+++ b/lambda/src/main/java/com/iluwatar/proxy/HelloService.java
@@ -0,0 +1,6 @@
+package com.iluwatar.proxy;
+
+public interface HelloService {
+ public void Hello(String name);
+
+}
diff --git a/lambda/src/main/java/com/iluwatar/proxy/HelloServiceCGLIBProxy.java b/lambda/src/main/java/com/iluwatar/proxy/HelloServiceCGLIBProxy.java
new file mode 100644
index 000000000000..2920225bdfc7
--- /dev/null
+++ b/lambda/src/main/java/com/iluwatar/proxy/HelloServiceCGLIBProxy.java
@@ -0,0 +1,37 @@
+package com.iluwatar.proxy;
+
+import java.lang.reflect.Method;
+
+import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+
+public class HelloServiceCGLIBProxy implements MethodInterceptor{
+
+ private Object target;
+
+ public Object getInstance(Object target) {
+ this.target = target;
+ Enhancer enhancer = new Enhancer();
+ enhancer.setSuperclass(target.getClass());
+ enhancer.setCallback(this);
+ return enhancer.create();
+ }
+
+ @Override
+ public Object intercept(Object object, Method method, Object[] args, MethodProxy proxy) throws Throwable {
+ System.out.println("CGLIB浠ｇ悊鏂规硶灏嗗紑濮嬫墽琛");
+ Object result = proxy.invokeSuper(object, args);
+ System.out.println("CGLIB浠ｇ悊鏂规硶灏嗘墽琛岀粨鏉");
+ return result;
+ }
+
+ public static void main(String[] args) {
+ HelloServiceCGLIBProxy handler = new HelloServiceCGLIBProxy();
+ HelloService proxy = (HelloService) handler.getInstance(new HelloServiceImpl());
+ proxy.Hello("duanmenghua");
+ }
+
+
+
+}
diff --git a/lambda/src/main/java/com/iluwatar/proxy/HelloServiceImpl.java b/lambda/src/main/java/com/iluwatar/proxy/HelloServiceImpl.java
new file mode 100644
index 000000000000..bfce1d5106c1
--- /dev/null
+++ b/lambda/src/main/java/com/iluwatar/proxy/HelloServiceImpl.java
@@ -0,0 +1,10 @@
+package com.iluwatar.proxy;
+
+public class HelloServiceImpl implements HelloService{
+
+ @Override
+ public void Hello(String name) {
+ System.out.println("Hello "+name);
+ }
+
+}
diff --git a/lambda/src/main/java/com/iluwatar/proxy/HelloServiceJDKProxy.java b/lambda/src/main/java/com/iluwatar/proxy/HelloServiceJDKProxy.java
new file mode 100644
index 000000000000..3b377d0d797b
--- /dev/null
+++ b/lambda/src/main/java/com/iluwatar/proxy/HelloServiceJDKProxy.java
@@ -0,0 +1,32 @@
+package com.iluwatar.proxy;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+public class HelloServiceJDKProxy implements InvocationHandler{
+
+ private Object target;
+
+ public Object bind(Object target) {
+ this.target = target;
+ return Proxy.newProxyInstance(target.getClass().getClassLoader(), target.getClass().getInterfaces(), this);
+
+ }
+
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ System.out.println("浠ｇ悊鏂规硶灏嗗紑濮嬫墽琛");
+ Object result = method.invoke(target, args);
+ System.out.println("浠ｇ悊鏂规硶灏嗘墽琛岀粨鏉");
+
+ return result;
+ }
+
+ public static void main(String[] args) {
+ HelloServiceJDKProxy handler = new HelloServiceJDKProxy();
+ HelloService proxy = (HelloService) handler.bind(new HelloServiceImpl());
+ proxy.Hello("duanmenghua");
+ }
+
+}
diff --git a/lambda/src/main/java/com/iluwatar/reflect/ReflectService.java b/lambda/src/main/java/com/iluwatar/reflect/ReflectService.java
new file mode 100644
index 000000000000..2cd9ec810369
--- /dev/null
+++ b/lambda/src/main/java/com/iluwatar/reflect/ReflectService.java
@@ -0,0 +1,23 @@
+package com.iluwatar.reflect;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * 鍙嶅皠
+ * @author duanmenghua
+ *
+ */
+public class ReflectService {
+ public void Hello(String name) {
+ System.out.println("hello word "+ name);
+ }
+
+ public static void main(String[] args) throws ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, SecurityException, IllegalArgumentException, InvocationTargetException {
+
+ Object service = Class.forName(ReflectService.class.getName()).newInstance();
+ Method method = service.getClass().getMethod("Hello", String.class);
+ method.invoke(service, "duanmenghua");
+ }
+
+}
diff --git a/mediator/mediator.iml b/mediator/mediator.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/mediator/mediator.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mediator/src/main/java/com/iluwatar/App.java b/mediator/src/main/java/com/iluwatar/App.java
deleted file mode 100644
index 4a7053e843e4..000000000000
--- a/mediator/src/main/java/com/iluwatar/App.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.iluwatar;
-
-/**
- *
- * Mediator encapsulates how set of objects (PartyMember) interact.
- * Instead of referring to each other directly they
- * use the mediator (Party) interface.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- Party party = new PartyImpl();
- Hobbit hobbit = new Hobbit();
- Wizard wizard = new Wizard();
- Rogue rogue = new Rogue();
- Hunter hunter = new Hunter();
-
- party.addMember(hobbit);
- party.addMember(wizard);
- party.addMember(rogue);
- party.addMember(hunter);
-
- hobbit.act(Action.ENEMY);
- wizard.act(Action.TALE);
- rogue.act(Action.GOLD);
- hunter.act(Action.HUNT);
- }
-}
diff --git a/mediator/src/main/java/com/iluwatar/Action.java b/mediator/src/main/java/com/iluwatar/mediator/Action.java
similarity index 87%
rename from mediator/src/main/java/com/iluwatar/Action.java
rename to mediator/src/main/java/com/iluwatar/mediator/Action.java
index 6dd42dc941d0..5e3dd59712e5 100644
--- a/mediator/src/main/java/com/iluwatar/Action.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/Action.java
@@ -1,28 +1,28 @@
-package com.iluwatar;
-
-public enum Action {
-
- HUNT, TALE, GOLD, ENEMY;
-
- public String toString() {
-
- String s = "";
- switch (this) {
- case ENEMY:
- s = "spotted enemies";
- break;
- case GOLD:
- s = "found gold";
- break;
- case HUNT:
- s = "hunted a rabbit";
- break;
- case TALE:
- s = "tells a tale";
- break;
- default:
- break;
- }
- return s;
- };
-}
+package com.iluwatar.mediator;
+
+public enum Action {
+
+ HUNT, TALE, GOLD, ENEMY;
+
+ public String toString() {
+
+ String s = "";
+ switch (this) {
+ case ENEMY:
+ s = "spotted enemies";
+ break;
+ case GOLD:
+ s = "found gold";
+ break;
+ case HUNT:
+ s = "hunted a rabbit";
+ break;
+ case TALE:
+ s = "tells a tale";
+ break;
+ default:
+ break;
+ }
+ return s;
+ };
+}
diff --git a/mediator/src/main/java/com/iluwatar/mediator/App.java b/mediator/src/main/java/com/iluwatar/mediator/App.java
new file mode 100644
index 000000000000..974e099110b5
--- /dev/null
+++ b/mediator/src/main/java/com/iluwatar/mediator/App.java
@@ -0,0 +1,32 @@
+package com.iluwatar.mediator;
+
+
+
+/**
+ *
+ * Mediator encapsulates how set of objects (PartyMember) interact.
+ * Instead of referring to each other directly they
+ * use the mediator (Party) interface.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ Party party = new PartyImpl();
+ Hobbit hobbit = new Hobbit();
+ Wizard wizard = new Wizard();
+ Rogue rogue = new Rogue();
+ Hunter hunter = new Hunter();
+
+ party.addMember(hobbit);
+ party.addMember(wizard);
+ party.addMember(rogue);
+ party.addMember(hunter);
+
+ hobbit.act(Action.ENEMY);
+ wizard.act(Action.TALE);
+ rogue.act(Action.GOLD);
+ hunter.act(Action.HUNT);
+ }
+}
diff --git a/mediator/src/main/java/com/iluwatar/Hobbit.java b/mediator/src/main/java/com/iluwatar/mediator/Hobbit.java
similarity index 77%
rename from mediator/src/main/java/com/iluwatar/Hobbit.java
rename to mediator/src/main/java/com/iluwatar/mediator/Hobbit.java
index ae8542fad2e9..9e17d24bd868 100644
--- a/mediator/src/main/java/com/iluwatar/Hobbit.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/Hobbit.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public class Hobbit extends PartyMemberBase {
-
- @Override
- public String toString() {
- return "Hobbit";
- }
-
-}
+package com.iluwatar.mediator;
+
+public class Hobbit extends PartyMemberBase {
+
+ @Override
+ public String toString() {
+ return "Hobbit";
+ }
+
+}
diff --git a/mediator/src/main/java/com/iluwatar/Hunter.java b/mediator/src/main/java/com/iluwatar/mediator/Hunter.java
similarity index 77%
rename from mediator/src/main/java/com/iluwatar/Hunter.java
rename to mediator/src/main/java/com/iluwatar/mediator/Hunter.java
index e27cdf8b9d6e..de15fa1639e1 100644
--- a/mediator/src/main/java/com/iluwatar/Hunter.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/Hunter.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public class Hunter extends PartyMemberBase {
-
- @Override
- public String toString() {
- return "Hunter";
- }
-
-}
+package com.iluwatar.mediator;
+
+public class Hunter extends PartyMemberBase {
+
+ @Override
+ public String toString() {
+ return "Hunter";
+ }
+
+}
diff --git a/mediator/src/main/java/com/iluwatar/Party.java b/mediator/src/main/java/com/iluwatar/mediator/Party.java
similarity index 80%
rename from mediator/src/main/java/com/iluwatar/Party.java
rename to mediator/src/main/java/com/iluwatar/mediator/Party.java
index cf72b31039ca..3f606b0a77d0 100644
--- a/mediator/src/main/java/com/iluwatar/Party.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/Party.java
@@ -1,14 +1,14 @@
-package com.iluwatar;
-
-/**
- *
- * Mediator interface.
- *
- */
-public interface Party {
-
- void addMember(PartyMember member);
-
- void act(PartyMember actor, Action action);
-
-}
+package com.iluwatar.mediator;
+
+/**
+ *
+ * Mediator interface.
+ *
+ */
+public interface Party {
+
+ void addMember(PartyMember member);
+
+ void act(PartyMember actor, Action action);
+
+}
diff --git a/mediator/src/main/java/com/iluwatar/PartyImpl.java b/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java
similarity index 85%
rename from mediator/src/main/java/com/iluwatar/PartyImpl.java
rename to mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java
index d95325d3f238..3be9bfe46749 100644
--- a/mediator/src/main/java/com/iluwatar/PartyImpl.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/PartyImpl.java
@@ -1,37 +1,37 @@
-package com.iluwatar;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PartyImpl implements Party {
-
- private List members;
-
- public PartyImpl() {
- members = new ArrayList<>();
- }
-
- @Override
- public void act(PartyMember actor, Action action) {
- for (PartyMember member: members) {
- if (member != actor) {
- member.partyAction(action);
- }
- }
- }
-
- @Override
- public void addMember(PartyMember member) {
- members.add(member);
- member.joinedParty(this);
- }
-
- // somebody hunts for food, call for dinner
-
- // somebody spots enemy, alert everybody
-
- // somebody finds gold, deal the gold with everybody
-
- // somebody tells a tale, call everybody to listen
-
-}
+package com.iluwatar.mediator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PartyImpl implements Party {
+
+ private List members;
+
+ public PartyImpl() {
+ members = new ArrayList();
+ }
+
+ @Override
+ public void act(PartyMember actor, Action action) {
+ for (PartyMember member: members) {
+ if (member != actor) {
+ member.partyAction(action);
+ }
+ }
+ }
+
+ @Override
+ public void addMember(PartyMember member) {
+ members.add(member);
+ member.joinedParty(this);
+ }
+
+ // somebody hunts for food, call for dinner
+
+ // somebody spots enemy, alert everybody
+
+ // somebody finds gold, deal the gold with everybody
+
+ // somebody tells a tale, call everybody to listen
+
+}
diff --git a/mediator/src/main/java/com/iluwatar/PartyMember.java b/mediator/src/main/java/com/iluwatar/mediator/PartyMember.java
similarity index 84%
rename from mediator/src/main/java/com/iluwatar/PartyMember.java
rename to mediator/src/main/java/com/iluwatar/mediator/PartyMember.java
index 80e04ba2f1d1..e2be70eff0c9 100644
--- a/mediator/src/main/java/com/iluwatar/PartyMember.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/PartyMember.java
@@ -1,15 +1,15 @@
-package com.iluwatar;
-
-/**
- *
- * Interface for party members interacting with Party.
- *
- */
-public interface PartyMember {
-
- void joinedParty(Party party);
-
- void partyAction(Action action);
-
- void act(Action action);
-}
+package com.iluwatar.mediator;
+
+/**
+ *
+ * Interface for party members interacting with Party.
+ *
+ */
+public interface PartyMember {
+
+ void joinedParty(Party party);
+
+ void partyAction(Action action);
+
+ void act(Action action);
+}
diff --git a/mediator/src/main/java/com/iluwatar/PartyMemberBase.java b/mediator/src/main/java/com/iluwatar/mediator/PartyMemberBase.java
similarity index 92%
rename from mediator/src/main/java/com/iluwatar/PartyMemberBase.java
rename to mediator/src/main/java/com/iluwatar/mediator/PartyMemberBase.java
index 77b7a7cb448a..04763842cbb1 100644
--- a/mediator/src/main/java/com/iluwatar/PartyMemberBase.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/PartyMemberBase.java
@@ -1,46 +1,46 @@
-package com.iluwatar;
-
-public abstract class PartyMemberBase implements PartyMember {
-
- protected Party party;
-
- @Override
- public void joinedParty(Party party) {
- System.out.println(this + " joins the party");
- this.party = party;
- }
-
- @Override
- public void partyAction(Action action) {
- String s = this + " ";
- switch (action) {
- case ENEMY:
- s = s + "runs for cover";
- break;
- case GOLD:
- s = s + "takes his share of the gold";
- break;
- case HUNT:
- s = s + "arrives for dinner";
- break;
- case TALE:
- s = s + "comes to listen";
- break;
- default:
- break;
- }
- System.out.println(s);
- }
-
- @Override
- public void act(Action action) {
- if (party != null) {
- System.out.println(this + " " + action.toString());
- party.act(this, action);
- }
- }
-
- @Override
- public abstract String toString();
-
-}
+package com.iluwatar.mediator;
+
+public abstract class PartyMemberBase implements PartyMember {
+
+ protected Party party;
+
+ @Override
+ public void joinedParty(Party party) {
+ System.out.println(this + " joins the party");
+ this.party = party;
+ }
+
+ @Override
+ public void partyAction(Action action) {
+ String s = this + " ";
+ switch (action) {
+ case ENEMY:
+ s = s + "runs for cover";
+ break;
+ case GOLD:
+ s = s + "takes his share of the gold";
+ break;
+ case HUNT:
+ s = s + "arrives for dinner";
+ break;
+ case TALE:
+ s = s + "comes to listen";
+ break;
+ default:
+ break;
+ }
+ System.out.println(s);
+ }
+
+ @Override
+ public void act(Action action) {
+ if (party != null) {
+ System.out.println(this + " " + action.toString());
+ party.act(this, action);
+ }
+ }
+
+ @Override
+ public abstract String toString();
+
+}
diff --git a/mediator/src/main/java/com/iluwatar/Rogue.java b/mediator/src/main/java/com/iluwatar/mediator/Rogue.java
similarity index 77%
rename from mediator/src/main/java/com/iluwatar/Rogue.java
rename to mediator/src/main/java/com/iluwatar/mediator/Rogue.java
index 5990e0523f5e..aab9144292fe 100644
--- a/mediator/src/main/java/com/iluwatar/Rogue.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/Rogue.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public class Rogue extends PartyMemberBase {
-
- @Override
- public String toString() {
- return "Rogue";
- }
-
-}
+package com.iluwatar.mediator;
+
+public class Rogue extends PartyMemberBase {
+
+ @Override
+ public String toString() {
+ return "Rogue";
+ }
+
+}
diff --git a/mediator/src/main/java/com/iluwatar/Wizard.java b/mediator/src/main/java/com/iluwatar/mediator/Wizard.java
similarity index 77%
rename from mediator/src/main/java/com/iluwatar/Wizard.java
rename to mediator/src/main/java/com/iluwatar/mediator/Wizard.java
index 689879865932..6bccd36ceebc 100644
--- a/mediator/src/main/java/com/iluwatar/Wizard.java
+++ b/mediator/src/main/java/com/iluwatar/mediator/Wizard.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public class Wizard extends PartyMemberBase {
-
- @Override
- public String toString() {
- return "Wizard";
- }
-
-}
+package com.iluwatar.mediator;
+
+public class Wizard extends PartyMemberBase {
+
+ @Override
+ public String toString() {
+ return "Wizard";
+ }
+
+}
diff --git a/memento/memento.iml b/memento/memento.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/memento/memento.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/memento/src/main/java/com/iluwatar/App.java b/memento/src/main/java/com/iluwatar/App.java
deleted file mode 100644
index c98bc320dd7d..000000000000
--- a/memento/src/main/java/com/iluwatar/App.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.iluwatar;
-
-import java.util.Stack;
-
-/**
- *
- * Memento pattern is for storing and restoring object
- * state. The object (Star) gives out a "memento"
- * (StarMemento) that contains the state of the object.
- * Later on the memento can be set back to the object
- * restoring the state.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- Stack states = new Stack<>();
-
- Star star = new Star(StarType.SUN, 10000000, 500000);
- System.out.println(star);
- states.add(star.getMemento());
- star.timePasses();
- System.out.println(star);
- states.add(star.getMemento());
- star.timePasses();
- System.out.println(star);
- states.add(star.getMemento());
- star.timePasses();
- System.out.println(star);
- states.add(star.getMemento());
- star.timePasses();
- System.out.println(star);
- while (states.size() > 0) {
- star.setMemento(states.pop());
- System.out.println(star);
- }
- }
-}
diff --git a/memento/src/main/java/com/iluwatar/memento/App.java b/memento/src/main/java/com/iluwatar/memento/App.java
new file mode 100644
index 000000000000..710f38d81daa
--- /dev/null
+++ b/memento/src/main/java/com/iluwatar/memento/App.java
@@ -0,0 +1,39 @@
+package com.iluwatar.memento;
+
+import java.util.Stack;
+
+/**
+ *
+ * Memento pattern is for storing and restoring object
+ * state. The object (Star) gives out a "memento"
+ * (StarMemento) that contains the state of the object.
+ * Later on the memento can be set back to the object
+ * restoring the state.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ Stack states = new Stack();
+
+ Star star = new Star(StarType.SUN, 10000000, 500000);
+ System.out.println(star);
+ states.add(star.getMemento());
+ star.timePasses();
+ System.out.println(star);
+ states.add(star.getMemento());
+ star.timePasses();
+ System.out.println(star);
+ states.add(star.getMemento());
+ star.timePasses();
+ System.out.println(star);
+ states.add(star.getMemento());
+ star.timePasses();
+ System.out.println(star);
+ while (states.size() > 0) {
+ star.setMemento(states.pop());
+ System.out.println(star);
+ }
+ }
+}
diff --git a/memento/src/main/java/com/iluwatar/Star.java b/memento/src/main/java/com/iluwatar/memento/Star.java
similarity index 93%
rename from memento/src/main/java/com/iluwatar/Star.java
rename to memento/src/main/java/com/iluwatar/memento/Star.java
index 03a5ad305ec7..03ec2fd52926 100644
--- a/memento/src/main/java/com/iluwatar/Star.java
+++ b/memento/src/main/java/com/iluwatar/memento/Star.java
@@ -1,68 +1,68 @@
-package com.iluwatar;
-
-/**
- *
- * Star uses "mementos" to store and restore state.
- *
- */
-public class Star {
-
- private StarType type;
- private int ageYears;
- private int massTons;
-
- public Star(StarType startType, int startAge, int startMass) {
- this.type = startType;
- this.ageYears = startAge;
- this.massTons = startMass;
- }
-
- public void timePasses() {
- ageYears *= 2;
- massTons *= 8;
- switch (type) {
- case RED_GIANT:
- type = StarType.WHITE_DWARF;
- break;
- case SUN:
- type = StarType.RED_GIANT;
- break;
- case SUPERNOVA:
- type = StarType.DEAD;
- break;
- case WHITE_DWARF:
- type = StarType.SUPERNOVA;
- break;
- case DEAD:
- ageYears *= 2;
- massTons = 0;
- break;
- default:
- break;
- }
- }
-
- StarMemento getMemento() {
-
- StarMementoInternal state = new StarMementoInternal();
- state.setAgeYears(ageYears);
- state.setMassTons(massTons);
- state.setType(type);
- return state;
-
- }
-
- void setMemento(StarMemento memento) {
-
- StarMementoInternal state = (StarMementoInternal) memento;
- this.type = state.getType();
- this.ageYears = state.getAgeYears();
- this.massTons = state.getMassTons();
-
- }
-
- @Override
- public String toString() {
- return String.format("%s age: %d years mass: %d tons", type.toString(), ageYears, massTons);
- }
-}
+package com.iluwatar.memento;
+
+/**
+ *
+ * Star uses "mementos" to store and restore state.
+ *
+ */
+public class Star {
+
+ private StarType type;
+ private int ageYears;
+ private int massTons;
+
+ public Star(StarType startType, int startAge, int startMass) {
+ this.type = startType;
+ this.ageYears = startAge;
+ this.massTons = startMass;
+ }
+
+ public void timePasses() {
+ ageYears *= 2;
+ massTons *= 8;
+ switch (type) {
+ case RED_GIANT:
+ type = StarType.WHITE_DWARF;
+ break;
+ case SUN:
+ type = StarType.RED_GIANT;
+ break;
+ case SUPERNOVA:
+ type = StarType.DEAD;
+ break;
+ case WHITE_DWARF:
+ type = StarType.SUPERNOVA;
+ break;
+ case DEAD:
+ ageYears *= 2;
+ massTons = 0;
+ break;
+ default:
+ break;
+ }
+ }
+
+ StarMemento getMemento() {
+
+ StarMementoInternal state = new StarMementoInternal();
+ state.setAgeYears(ageYears);
+ state.setMassTons(massTons);
+ state.setType(type);
+ return state;
+
+ }
+
+ void setMemento(StarMemento memento) {
+
+ StarMementoInternal state = (StarMementoInternal) memento;
+ this.type = state.getType();
+ this.ageYears = state.getAgeYears();
+ this.massTons = state.getMassTons();
+
+ }
+
+ @Override
+ public String toString() {
+ return String.format("%s age: %d years mass: %d tons", type.toString(), ageYears, massTons);
+ }
+}
diff --git a/memento/src/main/java/com/iluwatar/StarMemento.java b/memento/src/main/java/com/iluwatar/memento/StarMemento.java
similarity index 72%
rename from memento/src/main/java/com/iluwatar/StarMemento.java
rename to memento/src/main/java/com/iluwatar/memento/StarMemento.java
index 9d2806ac2550..b5ac94b17768 100644
--- a/memento/src/main/java/com/iluwatar/StarMemento.java
+++ b/memento/src/main/java/com/iluwatar/memento/StarMemento.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-/**
- *
- * External interface to memento.
- *
- */
-public interface StarMemento {
-
-}
+package com.iluwatar.memento;
+
+/**
+ *
+ * External interface to memento.
+ *
+ */
+public interface StarMemento {
+
+}
diff --git a/memento/src/main/java/com/iluwatar/StarMementoInternal.java b/memento/src/main/java/com/iluwatar/memento/StarMementoInternal.java
similarity index 90%
rename from memento/src/main/java/com/iluwatar/StarMementoInternal.java
rename to memento/src/main/java/com/iluwatar/memento/StarMementoInternal.java
index 45c8f7c11160..84c3b2e602a6 100644
--- a/memento/src/main/java/com/iluwatar/StarMementoInternal.java
+++ b/memento/src/main/java/com/iluwatar/memento/StarMementoInternal.java
@@ -1,32 +1,32 @@
-package com.iluwatar;
-
-/**
- *
- * Internal interface to memento.
- *
- */
-public class StarMementoInternal implements StarMemento {
-
- private StarType type;
- private int ageYears;
- private int massTons;
-
- public StarType getType() {
- return type;
- }
- public void setType(StarType type) {
- this.type = type;
- }
- public int getAgeYears() {
- return ageYears;
- }
- public void setAgeYears(int ageYears) {
- this.ageYears = ageYears;
- }
- public int getMassTons() {
- return massTons;
- }
- public void setMassTons(int massTons) {
- this.massTons = massTons;
- }
-}
+package com.iluwatar.memento;
+
+/**
+ *
+ * Internal interface to memento.
+ *
+ */
+public class StarMementoInternal implements StarMemento {
+
+ private StarType type;
+ private int ageYears;
+ private int massTons;
+
+ public StarType getType() {
+ return type;
+ }
+ public void setType(StarType type) {
+ this.type = type;
+ }
+ public int getAgeYears() {
+ return ageYears;
+ }
+ public void setAgeYears(int ageYears) {
+ this.ageYears = ageYears;
+ }
+ public int getMassTons() {
+ return massTons;
+ }
+ public void setMassTons(int massTons) {
+ this.massTons = massTons;
+ }
+}
diff --git a/memento/src/main/java/com/iluwatar/StarType.java b/memento/src/main/java/com/iluwatar/memento/StarType.java
similarity index 87%
rename from memento/src/main/java/com/iluwatar/StarType.java
rename to memento/src/main/java/com/iluwatar/memento/StarType.java
index 54b3521843ee..7b1f7a52d419 100644
--- a/memento/src/main/java/com/iluwatar/StarType.java
+++ b/memento/src/main/java/com/iluwatar/memento/StarType.java
@@ -1,36 +1,36 @@
-package com.iluwatar;
-
-public enum StarType {
-
- SUN,
- RED_GIANT,
- WHITE_DWARF,
- SUPERNOVA,
- DEAD;
-
- @Override
- public String toString() {
- String s = "";
- switch (this) {
- case RED_GIANT:
- s = "red giant";
- break;
- case SUN:
- s = "sun";
- break;
- case SUPERNOVA:
- s = "supernova";
- break;
- case WHITE_DWARF:
- s = "white dwarf";
- break;
- case DEAD:
- s = "dead star";
- break;
- default:
- break;
- }
- return s;
- }
-
-}
+package com.iluwatar.memento;
+
+public enum StarType {
+
+ SUN,
+ RED_GIANT,
+ WHITE_DWARF,
+ SUPERNOVA,
+ DEAD;
+
+ @Override
+ public String toString() {
+ String s = "";
+ switch (this) {
+ case RED_GIANT:
+ s = "red giant";
+ break;
+ case SUN:
+ s = "sun";
+ break;
+ case SUPERNOVA:
+ s = "supernova";
+ break;
+ case WHITE_DWARF:
+ s = "white dwarf";
+ break;
+ case DEAD:
+ s = "dead star";
+ break;
+ default:
+ break;
+ }
+ return s;
+ }
+
+}
diff --git a/observer/.gitignore b/observer/.gitignore
new file mode 100644
index 000000000000..5e56e040ec09
--- /dev/null
+++ b/observer/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/observer/com/iluwatar/App.main.pdf b/observer/com/iluwatar/App.main.pdf
new file mode 100644
index 000000000000..57b29a561e00
Binary files /dev/null and b/observer/com/iluwatar/App.main.pdf differ
diff --git a/observer/com/iluwatar/App.main.sdx b/observer/com/iluwatar/App.main.sdx
new file mode 100644
index 000000000000..89544b0d29bd
--- /dev/null
+++ b/observer/com/iluwatar/App.main.sdx
@@ -0,0 +1,43 @@
+user:Actor
+App:App
+Weather:Weather
+WeatherType:WeatherType
+Orcs:Orcs
+Hobbits:Hobbits
+
+user:App.main
+App[0]:Weather.
+Weather[0]:WeatherType.
+WeatherType[0]:WeatherType.
+WeatherType[1]:WeatherType.
+App[0]:Orcs.
+App[0]:Weather.addObserver
+App[0]:Hobbits.
+App[0]:Weather.addObserver
+App[0]:Weather.timePasses
+Weather[0]:Weather.$SWITCH_TABLE$com$iluwatar$WeatherType
+Weather[0]:WeatherType.values
+Weather[1]:WeatherType.toString
+Weather[0]:Weather.notifyObservers
+Weather[0]:Orcs.update
+Orcs[0]:Orcs.$SWITCH_TABLE$com$iluwatar$WeatherType
+Orcs[0]:WeatherType.values
+Weather[0]:Hobbits.update
+Hobbits[0]:Hobbits.$SWITCH_TABLE$com$iluwatar$WeatherType
+Hobbits[0]:WeatherType.values
+App[0]:Weather.timePasses
+Weather[0]:Weather.$SWITCH_TABLE$com$iluwatar$WeatherType
+Weather[1]:WeatherType.toString
+Weather[0]:Weather.notifyObservers
+Weather[0]:Orcs.update
+Orcs[0]:Orcs.$SWITCH_TABLE$com$iluwatar$WeatherType
+Weather[0]:Hobbits.update
+Hobbits[0]:Hobbits.$SWITCH_TABLE$com$iluwatar$WeatherType
+App[0]:Weather.timePasses
+Weather[0]:Weather.$SWITCH_TABLE$com$iluwatar$WeatherType
+Weather[1]:WeatherType.toString
+Weather[0]:Weather.notifyObservers
+Weather[0]:Orcs.update
+Orcs[0]:Orcs.$SWITCH_TABLE$com$iluwatar$WeatherType
+Weather[0]:Hobbits.update
+Hobbits[0]:Hobbits.$SWITCH_TABLE$com$iluwatar$WeatherType
diff --git a/observer/observer.iml b/observer/observer.iml
new file mode 100644
index 000000000000..57a0548ee6df
--- /dev/null
+++ b/observer/observer.iml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/observer/out/.gitignore b/observer/out/.gitignore
new file mode 100644
index 000000000000..5e56e040ec09
--- /dev/null
+++ b/observer/out/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/observer/src/dsd.java b/observer/src/dsd.java
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/observer/src/main/java/RER.java b/observer/src/main/java/RER.java
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/observer/src/main/java/RWW.java b/observer/src/main/java/RWW.java
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/observer/src/main/java/com/iluwatar/App.java b/observer/src/main/java/com/iluwatar/observer/App.java
similarity index 61%
rename from observer/src/main/java/com/iluwatar/App.java
rename to observer/src/main/java/com/iluwatar/observer/App.java
index a128fd38f1ed..ef6ee94bd7db 100644
--- a/observer/src/main/java/com/iluwatar/App.java
+++ b/observer/src/main/java/com/iluwatar/observer/App.java
@@ -1,25 +1,30 @@
-package com.iluwatar;
-
-/**
- *
- * Observer pattern defines one-to-many relationship
- * between objects. The target object sends change
- * notifications to its registered observers.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
-
- Weather weather = new Weather();
- weather.addObserver(new Orcs());
- weather.addObserver(new Hobbits());
-
- weather.timePasses();
- weather.timePasses();
- weather.timePasses();
- weather.timePasses();
-
- }
-}
+package com.iluwatar.observer;
+
+/**
+ *
+ * Observer pattern defines one-to-many relationship
+ * between objects. The target object sends change
+ * notifications to its registered observers.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+
+ Weather weather = new Weather();
+ weather.addObserver(new Orcs());
+ weather.addObserver(new Hobbits());
+
+ try {
+ weather.timePasses();
+ weather.timePasses();
+ weather.timePasses();
+ weather.timePasses();
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
+}
diff --git a/observer/src/main/java/com/iluwatar/Hobbits.java b/observer/src/main/java/com/iluwatar/observer/Hobbits.java
similarity index 66%
rename from observer/src/main/java/com/iluwatar/Hobbits.java
rename to observer/src/main/java/com/iluwatar/observer/Hobbits.java
index b4b09ab3c15e..c5c758e81698 100644
--- a/observer/src/main/java/com/iluwatar/Hobbits.java
+++ b/observer/src/main/java/com/iluwatar/observer/Hobbits.java
@@ -1,25 +1,27 @@
-package com.iluwatar;
-
-public class Hobbits implements WeatherObserver {
-
- @Override
- public void update(WeatherType currentWeather) {
- switch (currentWeather) {
- case COLD:
- System.out.println("The hobbits are shivering in the cold weather.");
- break;
- case RAINY:
- System.out.println("The hobbits look for cover from the rain.");
- break;
- case SUNNY:
- System.out.println("The happy hobbits bade in the warm sun.");
- break;
- case WINDY:
- System.out.println("The hobbits hold their hats tightly in the windy weather.");
- break;
- default:
- break;
- }
- }
-
-}
+package com.iluwatar.observer;
+
+public class Hobbits implements WeatherObserver {
+
+ @Override
+ public void update(WeatherType currentWeather) {
+ switch (currentWeather) {
+ case COLD:
+ System.out
+ .println("The hobbits are shivering in the cold weather.");
+ break;
+ case RAINY:
+ System.out.println("The hobbits look for cover from the rain.");
+ break;
+ case SUNNY:
+ System.out.println("The happy hobbits bade in the warm sun.");
+ break;
+ case WINDY:
+ System.out
+ .println("The hobbits hold their hats tightly in the windy weather.");
+ break;
+ default:
+ break;
+ }
+ }
+
+}
diff --git a/observer/src/main/java/com/iluwatar/Orcs.java b/observer/src/main/java/com/iluwatar/observer/Orcs.java
similarity index 91%
rename from observer/src/main/java/com/iluwatar/Orcs.java
rename to observer/src/main/java/com/iluwatar/observer/Orcs.java
index 05fc0a4c9064..db560cf58514 100644
--- a/observer/src/main/java/com/iluwatar/Orcs.java
+++ b/observer/src/main/java/com/iluwatar/observer/Orcs.java
@@ -1,25 +1,25 @@
-package com.iluwatar;
-
-public class Orcs implements WeatherObserver {
-
- @Override
- public void update(WeatherType currentWeather) {
- switch (currentWeather) {
- case COLD:
- System.out.println("The orcs are freezing cold.");
- break;
- case RAINY:
- System.out.println("The orcs are dripping wet.");
- break;
- case SUNNY:
- System.out.println("The sun hurts the orcs' eyes.");
- break;
- case WINDY:
- System.out.println("The orc smell almost vanishes in the wind.");
- break;
- default:
- break;
- }
- }
-
-}
+package com.iluwatar.observer;
+
+public class Orcs implements WeatherObserver {
+
+ @Override
+ public void update(WeatherType currentWeather) {
+ switch (currentWeather) {
+ case COLD:
+ System.out.println("The orcs are freezing cold.");
+ break;
+ case RAINY:
+ System.out.println("The orcs are dripping wet.");
+ break;
+ case SUNNY:
+ System.out.println("The sun hurts the orcs' eyes.");
+ break;
+ case WINDY:
+ System.out.println("The orc smell almost vanishes in the wind.");
+ break;
+ default:
+ break;
+ }
+ }
+
+}
diff --git a/observer/src/main/java/com/iluwatar/observer/Test.java b/observer/src/main/java/com/iluwatar/observer/Test.java
new file mode 100644
index 000000000000..31894f0307cc
--- /dev/null
+++ b/observer/src/main/java/com/iluwatar/observer/Test.java
@@ -0,0 +1 @@
+package com.iluwatar.observer;
diff --git a/observer/src/main/java/com/iluwatar/observer/WEE.java b/observer/src/main/java/com/iluwatar/observer/WEE.java
new file mode 100644
index 000000000000..31894f0307cc
--- /dev/null
+++ b/observer/src/main/java/com/iluwatar/observer/WEE.java
@@ -0,0 +1 @@
+package com.iluwatar.observer;
diff --git a/observer/src/main/java/com/iluwatar/Weather.java b/observer/src/main/java/com/iluwatar/observer/Weather.java
similarity index 90%
rename from observer/src/main/java/com/iluwatar/Weather.java
rename to observer/src/main/java/com/iluwatar/observer/Weather.java
index f3c11ac73fab..3ada84aa8317 100644
--- a/observer/src/main/java/com/iluwatar/Weather.java
+++ b/observer/src/main/java/com/iluwatar/observer/Weather.java
@@ -1,56 +1,56 @@
-package com.iluwatar;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * Weather can be observed by implementing WeatherObserver
- * interface and registering as listener.
- *
- */
-public class Weather {
-
- private WeatherType currentWeather;
- private List observers;
-
- public Weather() {
- observers = new ArrayList<>();
- currentWeather = WeatherType.SUNNY;
- }
-
- public void addObserver(WeatherObserver obs) {
- observers.add(obs);
- }
-
- public void removeObserver(WeatherObserver obs) {
- observers.remove(obs);
- }
-
- public void timePasses() {
- switch (currentWeather) {
- case COLD:
- currentWeather = WeatherType.SUNNY;
- break;
- case RAINY:
- currentWeather = WeatherType.WINDY;
- break;
- case SUNNY:
- currentWeather = WeatherType.RAINY;
- break;
- case WINDY:
- currentWeather = WeatherType.COLD;
- break;
- default:
- break;
- }
- System.out.println("The weather now changes to " + currentWeather);
- notifyObservers();
- }
-
- private void notifyObservers() {
- for (WeatherObserver obs: observers) {
- obs.update(currentWeather);
- }
- }
-}
+package com.iluwatar.observer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * Weather can be observed by implementing WeatherObserver
+ * interface and registering as listener.
+ *
+ */
+public class Weather {
+
+ private WeatherType currentWeather;
+ private List observers;
+
+ public Weather() {
+ observers = new ArrayList();
+ currentWeather = WeatherType.SUNNY;
+ }
+
+ public void addObserver(WeatherObserver obs) {
+ observers.add(obs);
+ }
+
+ public void removeObserver(WeatherObserver obs) {
+ observers.remove(obs);
+ }
+
+ public void timePasses() {
+ switch (currentWeather) {
+ case COLD:
+ currentWeather = WeatherType.SUNNY;
+ break;
+ case RAINY:
+ currentWeather = WeatherType.WINDY;
+ break;
+ case SUNNY:
+ currentWeather = WeatherType.RAINY;
+ break;
+ case WINDY:
+ currentWeather = WeatherType.COLD;
+ break;
+ default:
+ break;
+ }
+ System.out.println("The weather now changes to " + currentWeather);
+ notifyObservers();
+ }
+
+ private void notifyObservers() {
+ for (WeatherObserver obs: observers) {
+ obs.update(currentWeather);
+ }
+ }
+}
diff --git a/observer/src/main/java/com/iluwatar/WeatherObserver.java b/observer/src/main/java/com/iluwatar/observer/WeatherObserver.java
similarity index 78%
rename from observer/src/main/java/com/iluwatar/WeatherObserver.java
rename to observer/src/main/java/com/iluwatar/observer/WeatherObserver.java
index 6af0202405e6..c630ae38a4e9 100644
--- a/observer/src/main/java/com/iluwatar/WeatherObserver.java
+++ b/observer/src/main/java/com/iluwatar/observer/WeatherObserver.java
@@ -1,12 +1,12 @@
-package com.iluwatar;
-
-/**
- *
- * Observer interface.
- *
- */
-public interface WeatherObserver {
-
- void update(WeatherType currentWeather);
-
-}
+package com.iluwatar.observer;
+
+/**
+ *
+ * Observer interface.
+ *
+ */
+public interface WeatherObserver {
+
+ void update(WeatherType currentWeather);
+
+}
diff --git a/observer/src/main/java/com/iluwatar/WeatherType.java b/observer/src/main/java/com/iluwatar/observer/WeatherType.java
similarity index 78%
rename from observer/src/main/java/com/iluwatar/WeatherType.java
rename to observer/src/main/java/com/iluwatar/observer/WeatherType.java
index 9625fbab8bed..3c295176a54f 100644
--- a/observer/src/main/java/com/iluwatar/WeatherType.java
+++ b/observer/src/main/java/com/iluwatar/observer/WeatherType.java
@@ -1,14 +1,14 @@
-package com.iluwatar;
-
-public enum WeatherType {
-
- SUNNY,
- RAINY,
- WINDY,
- COLD;
-
- public String toString() {
- return this.name().toLowerCase();
- };
-
-}
+package com.iluwatar.observer;
+
+public enum WeatherType {
+
+ SUNNY,
+ RAINY,
+ WINDY,
+ COLD;
+
+ public String toString() {
+ return this.name().toLowerCase();
+ };
+
+}
diff --git a/observer/src/main/java/com/iluwatar/observer/dsfaa.java b/observer/src/main/java/com/iluwatar/observer/dsfaa.java
new file mode 100644
index 000000000000..31894f0307cc
--- /dev/null
+++ b/observer/src/main/java/com/iluwatar/observer/dsfaa.java
@@ -0,0 +1 @@
+package com.iluwatar.observer;
diff --git a/observer/src/test/log4j.xml b/observer/src/test/log4j.xml
new file mode 100644
index 000000000000..748d0c1a5271
--- /dev/null
+++ b/observer/src/test/log4j.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/observer/src/test/resources/configure/UATApplicationContext.xml b/observer/src/test/resources/configure/UATApplicationContext.xml
new file mode 100644
index 000000000000..818ef52f909e
--- /dev/null
+++ b/observer/src/test/resources/configure/UATApplicationContext.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/observer/src/test/resources/configure/prop.xml b/observer/src/test/resources/configure/prop.xml
new file mode 100644
index 000000000000..c7afbd60d256
--- /dev/null
+++ b/observer/src/test/resources/configure/prop.xml
@@ -0,0 +1,133 @@
+
+
+ false
+
+
+ $JAVA_HOME
+ server
+ -server -Xmx768m -XX:PermSize=128m -XX:MaxPermSize=256m -Duser.timezone=GMT+8 -Djava.awt.headless=true
+ 8005
+
+ 80
+
+
+
+ true
+
+ StartTomcat
+ nc.bs.tomcat.startup.BootStrapTomcatService
+ 15
+ true
+ false
+ start|stop
+
+
+ EJB_SERVICE
+ nc.bs.mw.naming.EJBContainerService
+ 15
+ true
+ false
+ start|stop
+
+ nc.bs.mw.tran.IerpTransactionManagerProxy
+ nc.bs.mw.tran.IerpUserTransaction
+ nc.bs.mw.tran.IerpTransactionManager
+ nc.bs.mw.sql.UFSqlObject
+ nc.bs.mw.ejbsql.IerpXADataSource
+
+ design
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ baptest807
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ bafi
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ bafi
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ iufo6103312
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ iufo6103312
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ batm
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ batm
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ bap8
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ bap8
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ foodmart
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ foodmart
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
\ No newline at end of file
diff --git a/observer/src/test/resources/configure/test_data_source.xml b/observer/src/test/resources/configure/test_data_source.xml
new file mode 100644
index 000000000000..2e45d5ee869c
--- /dev/null
+++ b/observer/src/test/resources/configure/test_data_source.xml
@@ -0,0 +1,19 @@
+
+
+
+ design
+ Z
+ jdbc:sqlserver://uapxt02:1433;database=newwf_1010;sendStringParametersAsUnicode=false;responseBuffering=adaptive
+ sa
+ sasasa
+ com.microsoft.sqlserver.jdbc.SQLServerDriver
+ SQLSERVER2008
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
\ No newline at end of file
diff --git a/observer/src/test/resources/configure/uat.properties b/observer/src/test/resources/configure/uat.properties
new file mode 100644
index 000000000000..f0b076c2de77
--- /dev/null
+++ b/observer/src/test/resources/configure/uat.properties
@@ -0,0 +1,33 @@
+#project information
+app_name=App Name
+app_version=V6.5
+
+#Common Configure
+##UAPHOME path, USE '/' for path separator
+nc_home=
+##verify log path, USE '/' for path separator
+log_file=debug.log
+
+# 0 don't print app log information on test result log
+# 1 only print app log information on test result log for fail testcase
+# 2 print application log information on test result log for all testcase
+uatlog_switch=2
+
+#dataFile Configure ,backup database data and restore database data
+data_backup_file = c:/temp/datafile.xml
+
+#default datasource
+default_datasource=design
+
+#BusinessServer configure
+serverstart=off
+login_username=
+login_password=
+
+#resources settings
+nc_configure_dir=resources/configure/
+testdata_config_dir=resources/data/conf/
+testdata_springfile_dir=resources/data/spring/
+testdata_objectfile_dir=resources/data/object/
+testdata_excelfile_dir=resources/data/excel/
+testdata_backup_dir=resources/data/backup/
diff --git a/observer/src/test/resources/configure/uat_spring_conf.xml b/observer/src/test/resources/configure/uat_spring_conf.xml
new file mode 100644
index 000000000000..169a91514700
--- /dev/null
+++ b/observer/src/test/resources/configure/uat_spring_conf.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/observer/src/test/resources/data/backup/README b/observer/src/test/resources/data/backup/README
new file mode 100644
index 000000000000..a5b99861a7dc
--- /dev/null
+++ b/observer/src/test/resources/data/backup/README
@@ -0,0 +1 @@
+备份文件夹
\ No newline at end of file
diff --git a/observer/src/test/resources/data/config/README b/observer/src/test/resources/data/config/README
new file mode 100644
index 000000000000..4849e2aef709
--- /dev/null
+++ b/observer/src/test/resources/data/config/README
@@ -0,0 +1 @@
+Object配置文件夹
\ No newline at end of file
diff --git a/observer/src/test/resources/data/excel/README b/observer/src/test/resources/data/excel/README
new file mode 100644
index 000000000000..4849e2aef709
--- /dev/null
+++ b/observer/src/test/resources/data/excel/README
@@ -0,0 +1 @@
+Object配置文件夹
\ No newline at end of file
diff --git a/observer/src/test/resources/data/object/README b/observer/src/test/resources/data/object/README
new file mode 100644
index 000000000000..271c286f3687
--- /dev/null
+++ b/observer/src/test/resources/data/object/README
@@ -0,0 +1 @@
+固化结果文件夹
\ No newline at end of file
diff --git a/observer/src/test/resources/data/spring/README b/observer/src/test/resources/data/spring/README
new file mode 100644
index 000000000000..961ee7009fd2
--- /dev/null
+++ b/observer/src/test/resources/data/spring/README
@@ -0,0 +1 @@
+spring 配置文件夹
\ No newline at end of file
diff --git a/observer/src/test/resources/temp/README b/observer/src/test/resources/temp/README
new file mode 100644
index 000000000000..ccffba66ffdd
--- /dev/null
+++ b/observer/src/test/resources/temp/README
@@ -0,0 +1 @@
+临时文件夹
\ No newline at end of file
diff --git a/observer/src/test/testng.xml b/observer/src/test/testng.xml
new file mode 100644
index 000000000000..1fa0f7461a59
--- /dev/null
+++ b/observer/src/test/testng.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 4da45cbe67e8..e27d0261fa3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,62 +1,63 @@
-
-
- 4.0.0
-
- com.iluwatar
- java-design-patterns
- 1.0-SNAPSHOT
- pom
-
-
-
- website
- scp://webhost.company.com/www/website
-
-
-
-
- UTF-8
-
-
- abstract-factory
- builder
- factory-method
- prototype
- singleton
- adapter
- bridge
- composite
- decorator
- facade
- flyweight
- proxy
- chain
- command
- interpreter
- iterator
- mediator
- memento
- observer
- state
- strategy
- template-method
- visitor
- double-checked-locking
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.0
-
- 1.7
- 1.7
-
-
-
-
-
+
+
+ 4.0.0
+
+ com.iluwatar
+ java-design-patterns
+ 1.0-SNAPSHOT
+ pom
+
+
+
+ website
+ scp://webhost.company.com/www/website
+
+
+
+
+ UTF-8
+
+
+ abstract-factory
+ builder
+ factory-method
+ prototype
+ singleton
+ adapter
+ bridge
+ composite
+ decorator
+ facade
+ flyweight
+ proxy
+ chain
+ command
+ interpreter
+ iterator
+ mediator
+ memento
+ observer
+ state
+ strategy
+ template-method
+ visitor
+ double-checked-locking
+ lambda
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.0
+
+ 1.7
+ 1.7
+
+
+
+
+
\ No newline at end of file
diff --git a/prototype/prototype.iml b/prototype/prototype.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/prototype/prototype.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/prototype/src/main/java/com/iluwatar/App.java b/prototype/src/main/java/com/iluwatar/prototype/App.java
similarity index 94%
rename from prototype/src/main/java/com/iluwatar/App.java
rename to prototype/src/main/java/com/iluwatar/prototype/App.java
index ff3790010239..e704103fa74b 100644
--- a/prototype/src/main/java/com/iluwatar/App.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/App.java
@@ -1,35 +1,35 @@
-package com.iluwatar;
-
-/**
- *
- * In Prototype we have a factory class (HeroFactoryImpl) producing
- * objects by cloning existing ones. In this example the factory's
- * prototype objects are given as constructor parameters.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- HeroFactory factory;
- Mage mage;
- Warlord warlord;
- Beast beast;
-
- factory = new HeroFactoryImpl(new ElfMage(), new ElfWarlord(), new ElfBeast());
- mage = factory.createMage();
- warlord = factory.createWarlord();
- beast = factory.createBeast();
- System.out.println(mage);
- System.out.println(warlord);
- System.out.println(beast);
-
- factory = new HeroFactoryImpl(new OrcMage(), new OrcWarlord(), new OrcBeast());
- mage = factory.createMage();
- warlord = factory.createWarlord();
- beast = factory.createBeast();
- System.out.println(mage);
- System.out.println(warlord);
- System.out.println(beast);
- }
-}
+package com.iluwatar.prototype;
+
+/**
+ *
+ * In Prototype we have a factory class (HeroFactoryImpl) producing
+ * objects by cloning existing ones. In this example the factory's
+ * prototype objects are given as constructor parameters.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ HeroFactory factory;
+ Mage mage;
+ Warlord warlord;
+ Beast beast;
+
+ factory = new HeroFactoryImpl(new ElfMage(), new ElfWarlord(), new ElfBeast());
+ mage = factory.createMage();
+ warlord = factory.createWarlord();
+ beast = factory.createBeast();
+ System.out.println(mage);
+ System.out.println(warlord);
+ System.out.println(beast);
+
+ factory = new HeroFactoryImpl(new OrcMage(), new OrcWarlord(), new OrcBeast());
+ mage = factory.createMage();
+ warlord = factory.createWarlord();
+ beast = factory.createBeast();
+ System.out.println(mage);
+ System.out.println(warlord);
+ System.out.println(beast);
+ }
+}
diff --git a/prototype/src/main/java/com/iluwatar/Beast.java b/prototype/src/main/java/com/iluwatar/prototype/Beast.java
similarity index 80%
rename from prototype/src/main/java/com/iluwatar/Beast.java
rename to prototype/src/main/java/com/iluwatar/prototype/Beast.java
index 2d1e978c0c03..ad01ad718e7c 100644
--- a/prototype/src/main/java/com/iluwatar/Beast.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/Beast.java
@@ -1,8 +1,8 @@
-package com.iluwatar;
-
-public abstract class Beast extends Prototype {
-
- @Override
- public abstract Beast clone() throws CloneNotSupportedException;
-
-}
+package com.iluwatar.prototype;
+
+public abstract class Beast extends Prototype {
+
+ @Override
+ public abstract Beast clone() throws CloneNotSupportedException;
+
+}
diff --git a/prototype/src/main/java/com/iluwatar/ElfBeast.java b/prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java
similarity index 86%
rename from prototype/src/main/java/com/iluwatar/ElfBeast.java
rename to prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java
index 40fac06b8757..b51f24d0558a 100644
--- a/prototype/src/main/java/com/iluwatar/ElfBeast.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/ElfBeast.java
@@ -1,21 +1,21 @@
-package com.iluwatar;
-
-public class ElfBeast extends Beast {
-
- public ElfBeast() {
- }
-
- public ElfBeast(ElfBeast beast) {
- }
-
- @Override
- public Beast clone() throws CloneNotSupportedException {
- return new ElfBeast(this);
- }
-
- @Override
- public String toString() {
- return "Elven eagle";
- }
-
-}
+package com.iluwatar.prototype;
+
+public class ElfBeast extends Beast {
+
+ public ElfBeast() {
+ }
+
+ public ElfBeast(ElfBeast beast) {
+ }
+
+ @Override
+ public Beast clone() throws CloneNotSupportedException {
+ return new ElfBeast(this);
+ }
+
+ @Override
+ public String toString() {
+ return "Elven eagle";
+ }
+
+}
diff --git a/prototype/src/main/java/com/iluwatar/ElfMage.java b/prototype/src/main/java/com/iluwatar/prototype/ElfMage.java
similarity index 86%
rename from prototype/src/main/java/com/iluwatar/ElfMage.java
rename to prototype/src/main/java/com/iluwatar/prototype/ElfMage.java
index 52919c91dc7d..26e60499f28e 100644
--- a/prototype/src/main/java/com/iluwatar/ElfMage.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/ElfMage.java
@@ -1,21 +1,21 @@
-package com.iluwatar;
-
-public class ElfMage extends Mage {
-
- public ElfMage() {
- }
-
- public ElfMage(ElfMage mage) {
- }
-
- @Override
- public Mage clone() throws CloneNotSupportedException {
- return new ElfMage(this);
- }
-
- @Override
- public String toString() {
- return "Elven mage";
- }
-
-}
+package com.iluwatar.prototype;
+
+public class ElfMage extends Mage {
+
+ public ElfMage() {
+ }
+
+ public ElfMage(ElfMage mage) {
+ }
+
+ @Override
+ public Mage clone() throws CloneNotSupportedException {
+ return new ElfMage(this);
+ }
+
+ @Override
+ public String toString() {
+ return "Elven mage";
+ }
+
+}
diff --git a/prototype/src/main/java/com/iluwatar/ElfWarlord.java b/prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java
similarity index 87%
rename from prototype/src/main/java/com/iluwatar/ElfWarlord.java
rename to prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java
index 51c52afdc5ca..6e098660112a 100644
--- a/prototype/src/main/java/com/iluwatar/ElfWarlord.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/ElfWarlord.java
@@ -1,21 +1,21 @@
-package com.iluwatar;
-
-public class ElfWarlord extends Warlord {
-
- public ElfWarlord() {
- }
-
- public ElfWarlord(ElfWarlord warlord) {
- }
-
- @Override
- public Warlord clone() throws CloneNotSupportedException {
- return new ElfWarlord(this);
- }
-
- @Override
- public String toString() {
- return "Elven warlord";
- }
-
-}
+package com.iluwatar.prototype;
+
+public class ElfWarlord extends Warlord {
+
+ public ElfWarlord() {
+ }
+
+ public ElfWarlord(ElfWarlord warlord) {
+ }
+
+ @Override
+ public Warlord clone() throws CloneNotSupportedException {
+ return new ElfWarlord(this);
+ }
+
+ @Override
+ public String toString() {
+ return "Elven warlord";
+ }
+
+}
diff --git a/prototype/src/main/java/com/iluwatar/HeroFactory.java b/prototype/src/main/java/com/iluwatar/prototype/HeroFactory.java
similarity index 80%
rename from prototype/src/main/java/com/iluwatar/HeroFactory.java
rename to prototype/src/main/java/com/iluwatar/prototype/HeroFactory.java
index e7145fa88571..d66ab298e2db 100644
--- a/prototype/src/main/java/com/iluwatar/HeroFactory.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/HeroFactory.java
@@ -1,16 +1,16 @@
-package com.iluwatar;
-
-/**
- *
- * Interface for the factory class.
- *
- */
-public interface HeroFactory {
-
- Mage createMage();
-
- Warlord createWarlord();
-
- Beast createBeast();
-
-}
+package com.iluwatar.prototype;
+
+/**
+ *
+ * Interface for the factory class.
+ *
+ */
+public interface HeroFactory {
+
+ Mage createMage();
+
+ Warlord createWarlord();
+
+ Beast createBeast();
+
+}
diff --git a/prototype/src/main/java/com/iluwatar/HeroFactoryImpl.java b/prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java
similarity index 91%
rename from prototype/src/main/java/com/iluwatar/HeroFactoryImpl.java
rename to prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java
index 7c96fc8a5f37..207b6f9ec56d 100644
--- a/prototype/src/main/java/com/iluwatar/HeroFactoryImpl.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/HeroFactoryImpl.java
@@ -1,44 +1,44 @@
-package com.iluwatar;
-
-/**
- *
- * Concrete factory class.
- *
- */
-public class HeroFactoryImpl implements HeroFactory {
-
- private Mage mage;
- private Warlord warlord;
- private Beast beast;
-
- public HeroFactoryImpl(Mage mage, Warlord warlord, Beast beast) {
- this.mage = mage;
- this.warlord = warlord;
- this.beast = beast;
- }
-
- public Mage createMage() {
- try {
- return mage.clone();
- } catch (CloneNotSupportedException e) {
- return null;
- }
- }
-
- public Warlord createWarlord() {
- try {
- return warlord.clone();
- } catch (CloneNotSupportedException e) {
- return null;
- }
- }
-
- public Beast createBeast() {
- try {
- return beast.clone();
- } catch (CloneNotSupportedException e) {
- return null;
- }
- }
-
-}
+package com.iluwatar.prototype;
+
+/**
+ *
+ * Concrete factory class.
+ *
+ */
+public class HeroFactoryImpl implements HeroFactory {
+
+ private Mage mage;
+ private Warlord warlord;
+ private Beast beast;
+
+ public HeroFactoryImpl(Mage mage, Warlord warlord, Beast beast) {
+ this.mage = mage;
+ this.warlord = warlord;
+ this.beast = beast;
+ }
+
+ public Mage createMage() {
+ try {
+ return mage.clone();
+ } catch (CloneNotSupportedException e) {
+ return null;
+ }
+ }
+
+ public Warlord createWarlord() {
+ try {
+ return warlord.clone();
+ } catch (CloneNotSupportedException e) {
+ return null;
+ }
+ }
+
+ public Beast createBeast() {
+ try {
+ return beast.clone();
+ } catch (CloneNotSupportedException e) {
+ return null;
+ }
+ }
+
+}
diff --git a/prototype/src/main/java/com/iluwatar/Mage.java b/prototype/src/main/java/com/iluwatar/prototype/Mage.java
similarity index 80%
rename from prototype/src/main/java/com/iluwatar/Mage.java
rename to prototype/src/main/java/com/iluwatar/prototype/Mage.java
index 726150633295..8c735a927ee5 100644
--- a/prototype/src/main/java/com/iluwatar/Mage.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/Mage.java
@@ -1,8 +1,8 @@
-package com.iluwatar;
-
-public abstract class Mage extends Prototype {
-
- @Override
- public abstract Mage clone() throws CloneNotSupportedException;
-
-}
+package com.iluwatar.prototype;
+
+public abstract class Mage extends Prototype {
+
+ @Override
+ public abstract Mage clone() throws CloneNotSupportedException;
+
+}
diff --git a/prototype/src/main/java/com/iluwatar/OrcBeast.java b/prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java
similarity index 86%
rename from prototype/src/main/java/com/iluwatar/OrcBeast.java
rename to prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java
index a5f52232c9f1..7a68c54b1738 100644
--- a/prototype/src/main/java/com/iluwatar/OrcBeast.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/OrcBeast.java
@@ -1,21 +1,21 @@
-package com.iluwatar;
-
-public class OrcBeast extends Beast {
-
- public OrcBeast() {
- }
-
- public OrcBeast(OrcBeast beast) {
- }
-
- @Override
- public Beast clone() throws CloneNotSupportedException {
- return new OrcBeast(this);
- }
-
- @Override
- public String toString() {
- return "Orcish wolf";
- }
-
-}
+package com.iluwatar.prototype;
+
+public class OrcBeast extends Beast {
+
+ public OrcBeast() {
+ }
+
+ public OrcBeast(OrcBeast beast) {
+ }
+
+ @Override
+ public Beast clone() throws CloneNotSupportedException {
+ return new OrcBeast(this);
+ }
+
+ @Override
+ public String toString() {
+ return "Orcish wolf";
+ }
+
+}
diff --git a/prototype/src/main/java/com/iluwatar/OrcMage.java b/prototype/src/main/java/com/iluwatar/prototype/OrcMage.java
similarity index 86%
rename from prototype/src/main/java/com/iluwatar/OrcMage.java
rename to prototype/src/main/java/com/iluwatar/prototype/OrcMage.java
index 88e7718ac55b..5ea31a465521 100644
--- a/prototype/src/main/java/com/iluwatar/OrcMage.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/OrcMage.java
@@ -1,21 +1,21 @@
-package com.iluwatar;
-
-public class OrcMage extends Mage {
-
- public OrcMage() {
- }
-
- public OrcMage(OrcMage mage) {
- }
-
- @Override
- public Mage clone() throws CloneNotSupportedException {
- return new OrcMage(this);
- }
-
- @Override
- public String toString() {
- return "Orcish mage";
- }
-
-}
+package com.iluwatar.prototype;
+
+public class OrcMage extends Mage {
+
+ public OrcMage() {
+ }
+
+ public OrcMage(OrcMage mage) {
+ }
+
+ @Override
+ public Mage clone() throws CloneNotSupportedException {
+ return new OrcMage(this);
+ }
+
+ @Override
+ public String toString() {
+ return "Orcish mage";
+ }
+
+}
diff --git a/prototype/src/main/java/com/iluwatar/OrcWarlord.java b/prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java
similarity index 87%
rename from prototype/src/main/java/com/iluwatar/OrcWarlord.java
rename to prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java
index 62ab25975d66..3b7b5358fa7e 100644
--- a/prototype/src/main/java/com/iluwatar/OrcWarlord.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/OrcWarlord.java
@@ -1,21 +1,21 @@
-package com.iluwatar;
-
-public class OrcWarlord extends Warlord {
-
- public OrcWarlord() {
- }
-
- public OrcWarlord(OrcWarlord warlord) {
- }
-
- @Override
- public Warlord clone() throws CloneNotSupportedException {
- return new OrcWarlord(this);
- }
-
- @Override
- public String toString() {
- return "Orcish warlord";
- }
-
-}
+package com.iluwatar.prototype;
+
+public class OrcWarlord extends Warlord {
+
+ public OrcWarlord() {
+ }
+
+ public OrcWarlord(OrcWarlord warlord) {
+ }
+
+ @Override
+ public Warlord clone() throws CloneNotSupportedException {
+ return new OrcWarlord(this);
+ }
+
+ @Override
+ public String toString() {
+ return "Orcish warlord";
+ }
+
+}
diff --git a/prototype/src/main/java/com/iluwatar/Prototype.java b/prototype/src/main/java/com/iluwatar/prototype/Prototype.java
similarity index 81%
rename from prototype/src/main/java/com/iluwatar/Prototype.java
rename to prototype/src/main/java/com/iluwatar/prototype/Prototype.java
index e508aea6e606..48fbabbd52a4 100644
--- a/prototype/src/main/java/com/iluwatar/Prototype.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/Prototype.java
@@ -1,8 +1,8 @@
-package com.iluwatar;
-
-public abstract class Prototype implements Cloneable {
-
- @Override
- public abstract Object clone() throws CloneNotSupportedException;
-
-}
+package com.iluwatar.prototype;
+
+public abstract class Prototype implements Cloneable {
+
+ @Override
+ public abstract Object clone() throws CloneNotSupportedException;
+
+}
diff --git a/prototype/src/main/java/com/iluwatar/Warlord.java b/prototype/src/main/java/com/iluwatar/prototype/Warlord.java
similarity index 80%
rename from prototype/src/main/java/com/iluwatar/Warlord.java
rename to prototype/src/main/java/com/iluwatar/prototype/Warlord.java
index 4ddcdd251135..80f1b7b4b67c 100644
--- a/prototype/src/main/java/com/iluwatar/Warlord.java
+++ b/prototype/src/main/java/com/iluwatar/prototype/Warlord.java
@@ -1,8 +1,8 @@
-package com.iluwatar;
-
-public abstract class Warlord extends Prototype {
-
- @Override
- public abstract Warlord clone() throws CloneNotSupportedException;
-
-}
+package com.iluwatar.prototype;
+
+public abstract class Warlord extends Prototype {
+
+ @Override
+ public abstract Warlord clone() throws CloneNotSupportedException;
+
+}
diff --git a/proxy/proxy.iml b/proxy/proxy.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/proxy/proxy.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/proxy/src/main/java/com/iluwatar/App.java b/proxy/src/main/java/com/iluwatar/App.java
deleted file mode 100644
index ceca214b23df..000000000000
--- a/proxy/src/main/java/com/iluwatar/App.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.iluwatar;
-
-/**
- *
- * Proxy (WizardTowerProxy) controls access to the
- * actual object (WizardTower).
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
-
- WizardTowerProxy tower = new WizardTowerProxy();
- tower.enter(new Wizard("Red wizard"));
- tower.enter(new Wizard("White wizard"));
- tower.enter(new Wizard("Black wizard"));
- tower.enter(new Wizard("Green wizard"));
- tower.enter(new Wizard("Brown wizard"));
-
- }
-}
diff --git a/proxy/src/main/java/com/iluwatar/proxy/App.java b/proxy/src/main/java/com/iluwatar/proxy/App.java
new file mode 100644
index 000000000000..09ddbe3838e8
--- /dev/null
+++ b/proxy/src/main/java/com/iluwatar/proxy/App.java
@@ -0,0 +1,24 @@
+package com.iluwatar.proxy;
+
+
+
+/**
+ *
+ * Proxy (WizardTowerProxy) controls access to the
+ * actual object (WizardTower).
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+
+ WizardTowerProxy tower = new WizardTowerProxy();
+ tower.enter(new Wizard("Red wizard"));
+ tower.enter(new Wizard("White wizard"));
+ tower.enter(new Wizard("Black wizard"));
+ tower.enter(new Wizard("Green wizard"));
+ tower.enter(new Wizard("Brown wizard"));
+
+ }
+}
diff --git a/proxy/src/main/java/com/iluwatar/Wizard.java b/proxy/src/main/java/com/iluwatar/proxy/Wizard.java
similarity index 81%
rename from proxy/src/main/java/com/iluwatar/Wizard.java
rename to proxy/src/main/java/com/iluwatar/proxy/Wizard.java
index 41c838fdcb73..1aa291d57f2d 100644
--- a/proxy/src/main/java/com/iluwatar/Wizard.java
+++ b/proxy/src/main/java/com/iluwatar/proxy/Wizard.java
@@ -1,16 +1,16 @@
-package com.iluwatar;
-
-public class Wizard {
-
- private String name;
-
- public Wizard(String name) {
- this.name = name;
- }
-
- @Override
- public String toString() {
- return name;
- }
-
-}
+package com.iluwatar.proxy;
+
+public class Wizard {
+
+ private String name;
+
+ public Wizard(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String toString() {
+ return name;
+ }
+
+}
diff --git a/proxy/src/main/java/com/iluwatar/WizardTower.java b/proxy/src/main/java/com/iluwatar/proxy/WizardTower.java
similarity index 79%
rename from proxy/src/main/java/com/iluwatar/WizardTower.java
rename to proxy/src/main/java/com/iluwatar/proxy/WizardTower.java
index 1b7320a3ede0..31b2a4103106 100644
--- a/proxy/src/main/java/com/iluwatar/WizardTower.java
+++ b/proxy/src/main/java/com/iluwatar/proxy/WizardTower.java
@@ -1,14 +1,16 @@
-package com.iluwatar;
-
-/**
- *
- * The object to be proxyed.
- *
- */
-public class WizardTower {
-
- public void enter(Wizard wizard) {
- System.out.println(wizard + " enters the tower.");
- }
-
-}
+package com.iluwatar.proxy;
+
+
+
+/**
+ *
+ * The object to be proxyed.
+ *
+ */
+public class WizardTower {
+
+ public void enter(Wizard wizard) {
+ System.out.println(wizard + " enters the tower.");
+ }
+
+}
diff --git a/proxy/src/main/java/com/iluwatar/WizardTowerProxy.java b/proxy/src/main/java/com/iluwatar/proxy/WizardTowerProxy.java
similarity index 88%
rename from proxy/src/main/java/com/iluwatar/WizardTowerProxy.java
rename to proxy/src/main/java/com/iluwatar/proxy/WizardTowerProxy.java
index 1be1cacea582..661a118f8321 100644
--- a/proxy/src/main/java/com/iluwatar/WizardTowerProxy.java
+++ b/proxy/src/main/java/com/iluwatar/proxy/WizardTowerProxy.java
@@ -1,23 +1,25 @@
-package com.iluwatar;
-
-/**
- *
- * The proxy controlling access to WizardTower.
- *
- */
-public class WizardTowerProxy extends WizardTower {
-
- private static final int NUM_WIZARDS_ALLOWED = 3;
-
- private int numWizards;
-
- @Override
- public void enter(Wizard wizard) {
- if (numWizards < NUM_WIZARDS_ALLOWED) {
- super.enter(wizard);
- numWizards++;
- } else {
- System.out.println(wizard + " is not allowed to enter!");
- }
- }
-}
+package com.iluwatar.proxy;
+
+
+
+/**
+ *
+ * The proxy controlling access to WizardTower.
+ *
+ */
+public class WizardTowerProxy extends WizardTower {
+
+ private static final int NUM_WIZARDS_ALLOWED = 3;
+
+ private int numWizards;
+
+ @Override
+ public void enter(Wizard wizard) {
+ if (numWizards < NUM_WIZARDS_ALLOWED) {
+ super.enter(wizard);
+ numWizards++;
+ } else {
+ System.out.println(wizard + " is not allowed to enter!");
+ }
+ }
+}
diff --git a/singleton/.gitignore b/singleton/.gitignore
new file mode 100644
index 000000000000..5e56e040ec09
--- /dev/null
+++ b/singleton/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/singleton/out/.gitignore b/singleton/out/.gitignore
new file mode 100644
index 000000000000..5e56e040ec09
--- /dev/null
+++ b/singleton/out/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/singleton/singleton.iml b/singleton/singleton.iml
new file mode 100644
index 000000000000..57a0548ee6df
--- /dev/null
+++ b/singleton/singleton.iml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/singleton/src/main/java/com/iluwatar/App.java b/singleton/src/main/java/com/iluwatar/singleton/App.java
similarity index 91%
rename from singleton/src/main/java/com/iluwatar/App.java
rename to singleton/src/main/java/com/iluwatar/singleton/App.java
index 01e26c4af1de..c0dbb0d23bf7 100644
--- a/singleton/src/main/java/com/iluwatar/App.java
+++ b/singleton/src/main/java/com/iluwatar/singleton/App.java
@@ -1,20 +1,20 @@
-package com.iluwatar;
-
-/**
- *
- * Singleton pattern ensures that the class (IvoryTower) can have only
- * one existing instance and provides global access to that instance.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
-
- IvoryTower ivoryTower1 = IvoryTower.getInstance();
- IvoryTower ivoryTower2 = IvoryTower.getInstance();
- System.out.println("ivoryTower1=" + ivoryTower1);
- System.out.println("ivoryTower2=" + ivoryTower2);
-
- }
-}
+package com.iluwatar.singleton;
+
+/**
+ *
+ * Singleton pattern ensures that the class (IvoryTower) can have only
+ * one existing instance and provides global access to that instance.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+
+ IvoryTower ivoryTower1 = IvoryTower.getInstance();
+ IvoryTower ivoryTower2 = IvoryTower.getInstance();
+ System.out.println("ivoryTower1=" + ivoryTower1);
+ System.out.println("ivoryTower2=" + ivoryTower2);
+
+ }
+}
diff --git a/singleton/src/main/java/com/iluwatar/IvoryTower.java b/singleton/src/main/java/com/iluwatar/singleton/IvoryTower.java
similarity index 53%
rename from singleton/src/main/java/com/iluwatar/IvoryTower.java
rename to singleton/src/main/java/com/iluwatar/singleton/IvoryTower.java
index 113962eb84c7..699281af2f61 100644
--- a/singleton/src/main/java/com/iluwatar/IvoryTower.java
+++ b/singleton/src/main/java/com/iluwatar/singleton/IvoryTower.java
@@ -1,17 +1,20 @@
-package com.iluwatar;
-
-/**
- *
- * Singleton class.
- *
- */
-public class IvoryTower {
-
- private static IvoryTower instance = new IvoryTower();
-
- private IvoryTower() {}
-
- public static IvoryTower getInstance() {
- return instance;
- }
-}
+package com.iluwatar.singleton;
+
+/**
+ *
+ * Singleton class.
+ *
+ */
+public class IvoryTower {
+
+ private static IvoryTower instance = null;
+
+ private IvoryTower() {}
+
+ public static IvoryTower getInstance() {
+ if(instance == null){
+ instance = new IvoryTower();
+ }
+ return instance;
+ }
+}
diff --git a/singleton/src/test/log4j.xml b/singleton/src/test/log4j.xml
new file mode 100644
index 000000000000..748d0c1a5271
--- /dev/null
+++ b/singleton/src/test/log4j.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/singleton/src/test/resources/configure/UATApplicationContext.xml b/singleton/src/test/resources/configure/UATApplicationContext.xml
new file mode 100644
index 000000000000..818ef52f909e
--- /dev/null
+++ b/singleton/src/test/resources/configure/UATApplicationContext.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/singleton/src/test/resources/configure/prop.xml b/singleton/src/test/resources/configure/prop.xml
new file mode 100644
index 000000000000..c7afbd60d256
--- /dev/null
+++ b/singleton/src/test/resources/configure/prop.xml
@@ -0,0 +1,133 @@
+
+
+ false
+
+
+ $JAVA_HOME
+ server
+ -server -Xmx768m -XX:PermSize=128m -XX:MaxPermSize=256m -Duser.timezone=GMT+8 -Djava.awt.headless=true
+ 8005
+
+ 80
+
+
+
+ true
+
+ StartTomcat
+ nc.bs.tomcat.startup.BootStrapTomcatService
+ 15
+ true
+ false
+ start|stop
+
+
+ EJB_SERVICE
+ nc.bs.mw.naming.EJBContainerService
+ 15
+ true
+ false
+ start|stop
+
+ nc.bs.mw.tran.IerpTransactionManagerProxy
+ nc.bs.mw.tran.IerpUserTransaction
+ nc.bs.mw.tran.IerpTransactionManager
+ nc.bs.mw.sql.UFSqlObject
+ nc.bs.mw.ejbsql.IerpXADataSource
+
+ design
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ baptest807
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ bafi
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ bafi
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ iufo6103312
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ iufo6103312
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ batm
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ batm
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ bap8
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ bap8
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
+ foodmart
+ Z
+ jdbc:oracle:thin:@20.10.130.235:1521:orcl
+ foodmart
+ jlehfdffcfmohiag
+ oracle.jdbc.OracleDriver
+ ORACLE11G
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
\ No newline at end of file
diff --git a/singleton/src/test/resources/configure/test_data_source.xml b/singleton/src/test/resources/configure/test_data_source.xml
new file mode 100644
index 000000000000..2e45d5ee869c
--- /dev/null
+++ b/singleton/src/test/resources/configure/test_data_source.xml
@@ -0,0 +1,19 @@
+
+
+
+ design
+ Z
+ jdbc:sqlserver://uapxt02:1433;database=newwf_1010;sendStringParametersAsUnicode=false;responseBuffering=adaptive
+ sa
+ sasasa
+ com.microsoft.sqlserver.jdbc.SQLServerDriver
+ SQLSERVER2008
+ 50
+ 1
+ nc.bs.mw.ejb.xares.IerpDataSource
+ nc.bs.mw.ejb.xares.IerpXADataSource
+ 0
+ 0
+ 0
+
+
\ No newline at end of file
diff --git a/singleton/src/test/resources/configure/uat.properties b/singleton/src/test/resources/configure/uat.properties
new file mode 100644
index 000000000000..f0b076c2de77
--- /dev/null
+++ b/singleton/src/test/resources/configure/uat.properties
@@ -0,0 +1,33 @@
+#project information
+app_name=App Name
+app_version=V6.5
+
+#Common Configure
+##UAPHOME path, USE '/' for path separator
+nc_home=
+##verify log path, USE '/' for path separator
+log_file=debug.log
+
+# 0 don't print app log information on test result log
+# 1 only print app log information on test result log for fail testcase
+# 2 print application log information on test result log for all testcase
+uatlog_switch=2
+
+#dataFile Configure ,backup database data and restore database data
+data_backup_file = c:/temp/datafile.xml
+
+#default datasource
+default_datasource=design
+
+#BusinessServer configure
+serverstart=off
+login_username=
+login_password=
+
+#resources settings
+nc_configure_dir=resources/configure/
+testdata_config_dir=resources/data/conf/
+testdata_springfile_dir=resources/data/spring/
+testdata_objectfile_dir=resources/data/object/
+testdata_excelfile_dir=resources/data/excel/
+testdata_backup_dir=resources/data/backup/
diff --git a/singleton/src/test/resources/configure/uat_spring_conf.xml b/singleton/src/test/resources/configure/uat_spring_conf.xml
new file mode 100644
index 000000000000..169a91514700
--- /dev/null
+++ b/singleton/src/test/resources/configure/uat_spring_conf.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/singleton/src/test/resources/data/backup/README b/singleton/src/test/resources/data/backup/README
new file mode 100644
index 000000000000..a5b99861a7dc
--- /dev/null
+++ b/singleton/src/test/resources/data/backup/README
@@ -0,0 +1 @@
+备份文件夹
\ No newline at end of file
diff --git a/singleton/src/test/resources/data/config/README b/singleton/src/test/resources/data/config/README
new file mode 100644
index 000000000000..4849e2aef709
--- /dev/null
+++ b/singleton/src/test/resources/data/config/README
@@ -0,0 +1 @@
+Object配置文件夹
\ No newline at end of file
diff --git a/singleton/src/test/resources/data/excel/README b/singleton/src/test/resources/data/excel/README
new file mode 100644
index 000000000000..4849e2aef709
--- /dev/null
+++ b/singleton/src/test/resources/data/excel/README
@@ -0,0 +1 @@
+Object配置文件夹
\ No newline at end of file
diff --git a/singleton/src/test/resources/data/object/README b/singleton/src/test/resources/data/object/README
new file mode 100644
index 000000000000..271c286f3687
--- /dev/null
+++ b/singleton/src/test/resources/data/object/README
@@ -0,0 +1 @@
+固化结果文件夹
\ No newline at end of file
diff --git a/singleton/src/test/resources/data/spring/README b/singleton/src/test/resources/data/spring/README
new file mode 100644
index 000000000000..961ee7009fd2
--- /dev/null
+++ b/singleton/src/test/resources/data/spring/README
@@ -0,0 +1 @@
+spring 配置文件夹
\ No newline at end of file
diff --git a/singleton/src/test/resources/temp/README b/singleton/src/test/resources/temp/README
new file mode 100644
index 000000000000..ccffba66ffdd
--- /dev/null
+++ b/singleton/src/test/resources/temp/README
@@ -0,0 +1 @@
+临时文件夹
\ No newline at end of file
diff --git a/singleton/src/test/testng.xml b/singleton/src/test/testng.xml
new file mode 100644
index 000000000000..1fa0f7461a59
--- /dev/null
+++ b/singleton/src/test/testng.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/state/src/main/java/com/iluwatar/AngryState.java b/state/src/main/java/com/iluwatar/state/AngryState.java
similarity index 89%
rename from state/src/main/java/com/iluwatar/AngryState.java
rename to state/src/main/java/com/iluwatar/state/AngryState.java
index 0a3de44e8973..6b4d2bdc47ae 100644
--- a/state/src/main/java/com/iluwatar/AngryState.java
+++ b/state/src/main/java/com/iluwatar/state/AngryState.java
@@ -1,21 +1,21 @@
-package com.iluwatar;
-
-public class AngryState implements State {
-
- private Mammoth mammoth;
-
- public AngryState(Mammoth mammoth) {
- this.mammoth = mammoth;
- }
-
- @Override
- public void observe() {
- System.out.println(String.format("%s is furious!", mammoth));
- }
-
- @Override
- public void onEnterState() {
- System.out.println(String.format("%s gets angry!", mammoth));
- }
-
-}
+package com.iluwatar.state;
+
+public class AngryState implements State {
+
+ private Mammoth mammoth;
+
+ public AngryState(Mammoth mammoth) {
+ this.mammoth = mammoth;
+ }
+
+ @Override
+ public void observe() {
+ System.out.println(String.format("%s is furious!", mammoth));
+ }
+
+ @Override
+ public void onEnterState() {
+ System.out.println(String.format("%s gets angry!", mammoth));
+ }
+
+}
diff --git a/state/src/main/java/com/iluwatar/App.java b/state/src/main/java/com/iluwatar/state/App.java
similarity index 90%
rename from state/src/main/java/com/iluwatar/App.java
rename to state/src/main/java/com/iluwatar/state/App.java
index 92a87619dd0a..249b0d135cce 100644
--- a/state/src/main/java/com/iluwatar/App.java
+++ b/state/src/main/java/com/iluwatar/state/App.java
@@ -1,24 +1,24 @@
-package com.iluwatar;
-
-/**
- *
- * In State pattern the object (Mammoth) has internal
- * state object (State) that defines the current
- * behavior. The state object can be changed
- * to alter the behavior.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
-
- Mammoth mammoth = new Mammoth();
- mammoth.observe();
- mammoth.timePasses();
- mammoth.observe();
- mammoth.timePasses();
- mammoth.observe();
-
- }
-}
+package com.iluwatar.state;
+
+/**
+ *
+ * In State pattern the object (Mammoth) has internal
+ * state object (State) that defines the current
+ * behavior. The state object can be changed
+ * to alter the behavior.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+
+ Mammoth mammoth = new Mammoth();
+ mammoth.observe();
+ mammoth.timePasses();
+ mammoth.observe();
+ mammoth.timePasses();
+ mammoth.observe();
+
+ }
+}
diff --git a/state/src/main/java/com/iluwatar/Mammoth.java b/state/src/main/java/com/iluwatar/state/Mammoth.java
similarity index 90%
rename from state/src/main/java/com/iluwatar/Mammoth.java
rename to state/src/main/java/com/iluwatar/state/Mammoth.java
index 78fb19682168..4327bbaf9deb 100644
--- a/state/src/main/java/com/iluwatar/Mammoth.java
+++ b/state/src/main/java/com/iluwatar/state/Mammoth.java
@@ -1,37 +1,37 @@
-package com.iluwatar;
-
-/**
- *
- * Mammoth has internal state that defines its behavior.
- *
- */
-public class Mammoth {
-
- private State state;
-
- public Mammoth() {
- state = new PeacefulState(this);
- }
-
- public void timePasses() {
- if (state.getClass().equals(PeacefulState.class)) {
- changeStateTo(new AngryState(this));
- } else {
- changeStateTo(new PeacefulState(this));
- }
- }
-
- private void changeStateTo(State newState) {
- this.state = newState;
- this.state.onEnterState();
- }
-
- @Override
- public String toString() {
- return "The mammoth";
- }
-
- public void observe() {
- this.state.observe();
- }
-}
+package com.iluwatar.state;
+
+/**
+ *
+ * Mammoth has internal state that defines its behavior.
+ *
+ */
+public class Mammoth {
+
+ private State state;
+
+ public Mammoth() {
+ state = new PeacefulState(this);
+ }
+
+ public void timePasses() {
+ if (state.getClass().equals(PeacefulState.class)) {
+ changeStateTo(new AngryState(this));
+ } else {
+ changeStateTo(new PeacefulState(this));
+ }
+ }
+
+ private void changeStateTo(State newState) {
+ this.state = newState;
+ this.state.onEnterState();
+ }
+
+ @Override
+ public String toString() {
+ return "The mammoth";
+ }
+
+ public void observe() {
+ this.state.observe();
+ }
+}
diff --git a/state/src/main/java/com/iluwatar/PeacefulState.java b/state/src/main/java/com/iluwatar/state/PeacefulState.java
similarity index 89%
rename from state/src/main/java/com/iluwatar/PeacefulState.java
rename to state/src/main/java/com/iluwatar/state/PeacefulState.java
index 6d6179a8b1be..293b584e3da3 100644
--- a/state/src/main/java/com/iluwatar/PeacefulState.java
+++ b/state/src/main/java/com/iluwatar/state/PeacefulState.java
@@ -1,21 +1,21 @@
-package com.iluwatar;
-
-public class PeacefulState implements State {
-
- private Mammoth mammoth;
-
- public PeacefulState(Mammoth mammoth) {
- this.mammoth = mammoth;
- }
-
- @Override
- public void observe() {
- System.out.println(String.format("%s is calm and peaceful.", mammoth));
- }
-
- @Override
- public void onEnterState() {
- System.out.println(String.format("%s calms down.", mammoth));
- }
-
-}
+package com.iluwatar.state;
+
+public class PeacefulState implements State {
+
+ private Mammoth mammoth;
+
+ public PeacefulState(Mammoth mammoth) {
+ this.mammoth = mammoth;
+ }
+
+ @Override
+ public void observe() {
+ System.out.println(String.format("%s is calm and peaceful.", mammoth));
+ }
+
+ @Override
+ public void onEnterState() {
+ System.out.println(String.format("%s calms down.", mammoth));
+ }
+
+}
diff --git a/state/src/main/java/com/iluwatar/State.java b/state/src/main/java/com/iluwatar/state/State.java
similarity index 74%
rename from state/src/main/java/com/iluwatar/State.java
rename to state/src/main/java/com/iluwatar/state/State.java
index 3570a63f7e04..0163236e87ce 100644
--- a/state/src/main/java/com/iluwatar/State.java
+++ b/state/src/main/java/com/iluwatar/state/State.java
@@ -1,14 +1,14 @@
-package com.iluwatar;
-
-/**
- *
- * State interface.
- *
- */
-public interface State {
-
- void onEnterState();
-
- void observe();
-
-}
+package com.iluwatar.state;
+
+/**
+ *
+ * State interface.
+ *
+ */
+public interface State {
+
+ void onEnterState();
+
+ void observe();
+
+}
diff --git a/state/state.iml b/state/state.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/state/state.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/strategy/src/main/java/com/iluwatar/App.java b/strategy/src/main/java/com/iluwatar/strategy/App.java
similarity index 93%
rename from strategy/src/main/java/com/iluwatar/App.java
rename to strategy/src/main/java/com/iluwatar/strategy/App.java
index 26e047dc8002..3a663c6632a4 100644
--- a/strategy/src/main/java/com/iluwatar/App.java
+++ b/strategy/src/main/java/com/iluwatar/strategy/App.java
@@ -1,23 +1,23 @@
-package com.iluwatar;
-
-/**
- *
- * Strategy (DragonSlayingStrategy) encapsulates the algorithm to use.
- * The object (DragonSlayer) can alter its behavior by changing its strategy.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- System.out.println("Green dragon spotted ahead!");
- DragonSlayer dragonSlayer = new DragonSlayer(new MeleeStrategy());
- dragonSlayer.goToBattle();
- System.out.println("Red dragon emerges.");
- dragonSlayer.changeStrategy(new ProjectileStrategy());
- dragonSlayer.goToBattle();
- System.out.println("Black dragon lands before you.");
- dragonSlayer.changeStrategy(new SpellStrategy());
- dragonSlayer.goToBattle();
- }
-}
+package com.iluwatar.strategy;
+
+/**
+ *
+ * Strategy (DragonSlayingStrategy) encapsulates the algorithm to use.
+ * The object (DragonSlayer) can alter its behavior by changing its strategy.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println("Green dragon spotted ahead!");
+ DragonSlayer dragonSlayer = new DragonSlayer(new MeleeStrategy());
+ dragonSlayer.goToBattle();
+ System.out.println("Red dragon emerges.");
+ dragonSlayer.changeStrategy(new ProjectileStrategy());
+ dragonSlayer.goToBattle();
+ System.out.println("Black dragon lands before you.");
+ dragonSlayer.changeStrategy(new SpellStrategy());
+ dragonSlayer.goToBattle();
+ }
+}
diff --git a/strategy/src/main/java/com/iluwatar/DragonSlayer.java b/strategy/src/main/java/com/iluwatar/strategy/DragonSlayer.java
similarity index 89%
rename from strategy/src/main/java/com/iluwatar/DragonSlayer.java
rename to strategy/src/main/java/com/iluwatar/strategy/DragonSlayer.java
index 0111c7e66dec..466b6e628651 100644
--- a/strategy/src/main/java/com/iluwatar/DragonSlayer.java
+++ b/strategy/src/main/java/com/iluwatar/strategy/DragonSlayer.java
@@ -1,23 +1,23 @@
-package com.iluwatar;
-
-/**
- *
- * DragonSlayer uses different strategies to slay the dragon.
- *
- */
-public class DragonSlayer {
-
- private DragonSlayingStrategy strategy;
-
- public DragonSlayer(DragonSlayingStrategy strategy) {
- this.strategy = strategy;
- }
-
- public void changeStrategy(DragonSlayingStrategy strategy) {
- this.strategy = strategy;
- }
-
- public void goToBattle() {
- strategy.execute();
- }
-}
+package com.iluwatar.strategy;
+
+/**
+ *
+ * DragonSlayer uses different strategies to slay the dragon.
+ *
+ */
+public class DragonSlayer {
+
+ private DragonSlayingStrategy strategy;
+
+ public DragonSlayer(DragonSlayingStrategy strategy) {
+ this.strategy = strategy;
+ }
+
+ public void changeStrategy(DragonSlayingStrategy strategy) {
+ this.strategy = strategy;
+ }
+
+ public void goToBattle() {
+ strategy.execute();
+ }
+}
diff --git a/strategy/src/main/java/com/iluwatar/DragonSlayingStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/DragonSlayingStrategy.java
similarity index 75%
rename from strategy/src/main/java/com/iluwatar/DragonSlayingStrategy.java
rename to strategy/src/main/java/com/iluwatar/strategy/DragonSlayingStrategy.java
index 100ad29ed20f..b5c2a08681b8 100644
--- a/strategy/src/main/java/com/iluwatar/DragonSlayingStrategy.java
+++ b/strategy/src/main/java/com/iluwatar/strategy/DragonSlayingStrategy.java
@@ -1,12 +1,12 @@
-package com.iluwatar;
-
-/**
- *
- * Strategy interface.
- *
- */
-public interface DragonSlayingStrategy {
-
- void execute();
-
-}
+package com.iluwatar.strategy;
+
+/**
+ *
+ * Strategy interface.
+ *
+ */
+public interface DragonSlayingStrategy {
+
+ void execute();
+
+}
diff --git a/strategy/src/main/java/com/iluwatar/MeleeStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/MeleeStrategy.java
similarity index 84%
rename from strategy/src/main/java/com/iluwatar/MeleeStrategy.java
rename to strategy/src/main/java/com/iluwatar/strategy/MeleeStrategy.java
index 49c06e826a67..0ae08fc62db6 100644
--- a/strategy/src/main/java/com/iluwatar/MeleeStrategy.java
+++ b/strategy/src/main/java/com/iluwatar/strategy/MeleeStrategy.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public class MeleeStrategy implements DragonSlayingStrategy {
-
- @Override
- public void execute() {
- System.out.println("With your Excalibur you severe the dragon's head!");
- }
-
-}
+package com.iluwatar.strategy;
+
+public class MeleeStrategy implements DragonSlayingStrategy {
+
+ @Override
+ public void execute() {
+ System.out.println("With your Excalibur you severe the dragon's head!");
+ }
+
+}
diff --git a/strategy/src/main/java/com/iluwatar/ProjectileStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/ProjectileStrategy.java
similarity index 87%
rename from strategy/src/main/java/com/iluwatar/ProjectileStrategy.java
rename to strategy/src/main/java/com/iluwatar/strategy/ProjectileStrategy.java
index 37c4a14cc73b..66a6bc7feddf 100644
--- a/strategy/src/main/java/com/iluwatar/ProjectileStrategy.java
+++ b/strategy/src/main/java/com/iluwatar/strategy/ProjectileStrategy.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public class ProjectileStrategy implements DragonSlayingStrategy {
-
- @Override
- public void execute() {
- System.out.println("You shoot the dragon with the magical crossbow and it falls dead on the ground!");
- }
-
-}
+package com.iluwatar.strategy;
+
+public class ProjectileStrategy implements DragonSlayingStrategy {
+
+ @Override
+ public void execute() {
+ System.out.println("You shoot the dragon with the magical crossbow and it falls dead on the ground!");
+ }
+
+}
diff --git a/strategy/src/main/java/com/iluwatar/SpellStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/SpellStrategy.java
similarity index 86%
rename from strategy/src/main/java/com/iluwatar/SpellStrategy.java
rename to strategy/src/main/java/com/iluwatar/strategy/SpellStrategy.java
index 3dab043296a1..21497e66e928 100644
--- a/strategy/src/main/java/com/iluwatar/SpellStrategy.java
+++ b/strategy/src/main/java/com/iluwatar/strategy/SpellStrategy.java
@@ -1,10 +1,10 @@
-package com.iluwatar;
-
-public class SpellStrategy implements DragonSlayingStrategy {
-
- @Override
- public void execute() {
- System.out.println("You cast the spell of disintegration and the dragon vaporizes in a pile of dust!");
- }
-
-}
+package com.iluwatar.strategy;
+
+public class SpellStrategy implements DragonSlayingStrategy {
+
+ @Override
+ public void execute() {
+ System.out.println("You cast the spell of disintegration and the dragon vaporizes in a pile of dust!");
+ }
+
+}
diff --git a/strategy/strategy.iml b/strategy/strategy.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/strategy/strategy.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/template-method/src/main/java/com/iluwatar/App.java b/template-method/src/main/java/com/iluwatar/template/method/App.java
similarity index 90%
rename from template-method/src/main/java/com/iluwatar/App.java
rename to template-method/src/main/java/com/iluwatar/template/method/App.java
index 0f6ccd6443e4..87d087d49b77 100644
--- a/template-method/src/main/java/com/iluwatar/App.java
+++ b/template-method/src/main/java/com/iluwatar/template/method/App.java
@@ -1,19 +1,19 @@
-package com.iluwatar;
-
-/**
- *
- * Template Method (StealingMethod) defines skeleton for the
- * algorithm and subclasses (HitAndRunMethod, SubtleMethod)
- * fill in the blanks.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
- HalflingThief thief = new HalflingThief(new HitAndRunMethod());
- thief.steal();
- thief.changeMethod(new SubtleMethod());
- thief.steal();
- }
-}
+package com.iluwatar.template.method;
+
+/**
+ *
+ * Template Method (StealingMethod) defines skeleton for the
+ * algorithm and subclasses (HitAndRunMethod, SubtleMethod)
+ * fill in the blanks.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ HalflingThief thief = new HalflingThief(new HitAndRunMethod());
+ thief.steal();
+ thief.changeMethod(new SubtleMethod());
+ thief.steal();
+ }
+}
diff --git a/template-method/src/main/java/com/iluwatar/HalflingThief.java b/template-method/src/main/java/com/iluwatar/template/method/HalflingThief.java
similarity index 87%
rename from template-method/src/main/java/com/iluwatar/HalflingThief.java
rename to template-method/src/main/java/com/iluwatar/template/method/HalflingThief.java
index 844fd00f895a..9fce6a45a6e5 100644
--- a/template-method/src/main/java/com/iluwatar/HalflingThief.java
+++ b/template-method/src/main/java/com/iluwatar/template/method/HalflingThief.java
@@ -1,23 +1,23 @@
-package com.iluwatar;
-
-/**
- *
- * Halfling thief uses StealingMethod to steal.
- *
- */
-public class HalflingThief {
-
- private StealingMethod method;
-
- public HalflingThief(StealingMethod method) {
- this.method = method;
- }
-
- public void steal() {
- method.steal();
- }
-
- public void changeMethod(StealingMethod method) {
- this.method = method;
- }
-}
+package com.iluwatar.template.method;
+
+/**
+ *
+ * Halfling thief uses StealingMethod to steal.
+ *
+ */
+public class HalflingThief {
+
+ private StealingMethod method;
+
+ public HalflingThief(StealingMethod method) {
+ this.method = method;
+ }
+
+ public void steal() {
+ method.steal();
+ }
+
+ public void changeMethod(StealingMethod method) {
+ this.method = method;
+ }
+}
diff --git a/template-method/src/main/java/com/iluwatar/HitAndRunMethod.java b/template-method/src/main/java/com/iluwatar/template/method/HitAndRunMethod.java
similarity index 90%
rename from template-method/src/main/java/com/iluwatar/HitAndRunMethod.java
rename to template-method/src/main/java/com/iluwatar/template/method/HitAndRunMethod.java
index 99c0d61d12c3..313ead3a5f8a 100644
--- a/template-method/src/main/java/com/iluwatar/HitAndRunMethod.java
+++ b/template-method/src/main/java/com/iluwatar/template/method/HitAndRunMethod.java
@@ -1,20 +1,20 @@
-package com.iluwatar;
-
-public class HitAndRunMethod extends StealingMethod {
-
- @Override
- protected String pickTarget() {
- return "old goblin woman";
- }
-
- @Override
- protected void confuseTarget(String target) {
- System.out.println("Approach the " + target + " from behind.");
- }
-
- @Override
- protected void stealTheItem(String target) {
- System.out.println("Grab the handbag and run away fast!");
- }
-
-}
+package com.iluwatar.template.method;
+
+public class HitAndRunMethod extends StealingMethod {
+
+ @Override
+ protected String pickTarget() {
+ return "old goblin woman";
+ }
+
+ @Override
+ protected void confuseTarget(String target) {
+ System.out.println("Approach the " + target + " from behind.");
+ }
+
+ @Override
+ protected void stealTheItem(String target) {
+ System.out.println("Grab the handbag and run away fast!");
+ }
+
+}
diff --git a/template-method/src/main/java/com/iluwatar/StealingMethod.java b/template-method/src/main/java/com/iluwatar/template/method/StealingMethod.java
similarity index 90%
rename from template-method/src/main/java/com/iluwatar/StealingMethod.java
rename to template-method/src/main/java/com/iluwatar/template/method/StealingMethod.java
index a57d8296f58f..3a75786ccf56 100644
--- a/template-method/src/main/java/com/iluwatar/StealingMethod.java
+++ b/template-method/src/main/java/com/iluwatar/template/method/StealingMethod.java
@@ -1,22 +1,22 @@
-package com.iluwatar;
-
-/**
- *
- * Template Method base class.
- *
- */
-public abstract class StealingMethod {
-
- protected abstract String pickTarget();
-
- protected abstract void confuseTarget(String target);
-
- protected abstract void stealTheItem(String target);
-
- public void steal() {
- String target = pickTarget();
- System.out.println("The target has been chosen as " + target + ".");
- confuseTarget(target);
- stealTheItem(target);
- }
-}
+package com.iluwatar.template.method;
+
+/**
+ *
+ * Template Method base class.
+ *
+ */
+public abstract class StealingMethod {
+
+ protected abstract String pickTarget();
+
+ protected abstract void confuseTarget(String target);
+
+ protected abstract void stealTheItem(String target);
+
+ public void steal() {
+ String target = pickTarget();
+ System.out.println("The target has been chosen as " + target + ".");
+ confuseTarget(target);
+ stealTheItem(target);
+ }
+}
diff --git a/template-method/src/main/java/com/iluwatar/SubtleMethod.java b/template-method/src/main/java/com/iluwatar/template/method/SubtleMethod.java
similarity index 90%
rename from template-method/src/main/java/com/iluwatar/SubtleMethod.java
rename to template-method/src/main/java/com/iluwatar/template/method/SubtleMethod.java
index 8967a92d6426..2c851c43673f 100644
--- a/template-method/src/main/java/com/iluwatar/SubtleMethod.java
+++ b/template-method/src/main/java/com/iluwatar/template/method/SubtleMethod.java
@@ -1,20 +1,20 @@
-package com.iluwatar;
-
-public class SubtleMethod extends StealingMethod {
-
- @Override
- protected String pickTarget() {
- return "shop keeper";
- }
-
- @Override
- protected void confuseTarget(String target) {
- System.out.println("Approach the " + target + " with tears running and hug him!");
- }
-
- @Override
- protected void stealTheItem(String target) {
- System.out.println("While in close contact grab the " + target + "'s wallet.");
- }
-
-}
+package com.iluwatar.template.method;
+
+public class SubtleMethod extends StealingMethod {
+
+ @Override
+ protected String pickTarget() {
+ return "shop keeper";
+ }
+
+ @Override
+ protected void confuseTarget(String target) {
+ System.out.println("Approach the " + target + " with tears running and hug him!");
+ }
+
+ @Override
+ protected void stealTheItem(String target) {
+ System.out.println("While in close contact grab the " + target + "'s wallet.");
+ }
+
+}
diff --git a/template-method/template-method.iml b/template-method/template-method.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/template-method/template-method.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/pom.xml b/test/pom.xml
new file mode 100644
index 000000000000..3421d505fcf2
--- /dev/null
+++ b/test/pom.xml
@@ -0,0 +1,27 @@
+
+
+ 4.0.0
+
+ com.iluwatar
+ java-design-patterns
+ 1.0-SNAPSHOT
+
+ com.iluwatar
+ test
+ 1.0-SNAPSHOT
+ test
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.3
+
+ 1.8
+ 1.8
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/src/main/java/com/ronly/lambda/Lambda.java b/test/src/main/java/com/ronly/lambda/Lambda.java
new file mode 100644
index 000000000000..6d2f8a92174d
--- /dev/null
+++ b/test/src/main/java/com/ronly/lambda/Lambda.java
@@ -0,0 +1,25 @@
+package com.ronly.lambda;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Created by duanmenghua on 2017-07-24.
+ */
+public class Lambda {
+ public static void main(String[] args) {
+
+ List result = new LinkedList<>();
+ result.add(1);
+ result.add(3);
+ result.add(4);
+ result.add(7);
+ result.add(5);
+ result.add(7);
+ List collect = result.stream().filter(x -> x > 3).distinct().collect(Collectors.toList());
+ System.out.println(collect);
+
+
+ }
+}
diff --git a/test/test.iml b/test/test.iml
new file mode 100644
index 000000000000..bc7ef2d9d966
--- /dev/null
+++ b/test/test.iml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/visitor/src/main/java/com/iluwatar/App.java b/visitor/src/main/java/com/iluwatar/visitor/App.java
similarity index 92%
rename from visitor/src/main/java/com/iluwatar/App.java
rename to visitor/src/main/java/com/iluwatar/visitor/App.java
index 1de762fff7b9..659a6c7908cc 100644
--- a/visitor/src/main/java/com/iluwatar/App.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/App.java
@@ -1,23 +1,23 @@
-package com.iluwatar;
-
-/**
- *
- * Visitor pattern defines mechanism to apply operations
- * (UnitVisitor) on nodes (Unit) in hierarchy. New operations
- * can be added without altering the node interface.
- *
- */
-public class App
-{
- public static void main( String[] args )
- {
-
- Commander commander = new Commander(
- new Sergeant(new Soldier(), new Soldier(), new Soldier()),
- new Sergeant(new Soldier(), new Soldier(), new Soldier()));
- commander.accept(new SoldierVisitor());
- commander.accept(new SergeantVisitor());
- commander.accept(new CommanderVisitor());
-
- }
-}
+package com.iluwatar.visitor;
+
+/**
+ *
+ * Visitor pattern defines mechanism to apply operations
+ * (UnitVisitor) on nodes (Unit) in hierarchy. New operations
+ * can be added without altering the node interface.
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+
+ Commander commander = new Commander(
+ new Sergeant(new Soldier(), new Soldier(), new Soldier()),
+ new Sergeant(new Soldier(), new Soldier(), new Soldier()));
+ commander.accept(new SoldierVisitor());
+ commander.accept(new SergeantVisitor());
+ commander.accept(new CommanderVisitor());
+
+ }
+}
diff --git a/visitor/src/main/java/com/iluwatar/Commander.java b/visitor/src/main/java/com/iluwatar/visitor/Commander.java
similarity index 87%
rename from visitor/src/main/java/com/iluwatar/Commander.java
rename to visitor/src/main/java/com/iluwatar/visitor/Commander.java
index 6366abeafbf1..5ba51ea8969a 100644
--- a/visitor/src/main/java/com/iluwatar/Commander.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/Commander.java
@@ -1,19 +1,19 @@
-package com.iluwatar;
-
-public class Commander extends Unit {
-
- public Commander(Unit ... children) {
- super(children);
- }
-
- @Override
- public void accept(UnitVisitor visitor) {
- visitor.visitCommander(this);
- super.accept(visitor);
- }
-
- @Override
- public String toString() {
- return "commander";
- }
-}
+package com.iluwatar.visitor;
+
+public class Commander extends Unit {
+
+ public Commander(Unit ... children) {
+ super(children);
+ }
+
+ @Override
+ public void accept(UnitVisitor visitor) {
+ visitor.visitCommander(this);
+ super.accept(visitor);
+ }
+
+ @Override
+ public String toString() {
+ return "commander";
+ }
+}
diff --git a/visitor/src/main/java/com/iluwatar/CommanderVisitor.java b/visitor/src/main/java/com/iluwatar/visitor/CommanderVisitor.java
similarity index 89%
rename from visitor/src/main/java/com/iluwatar/CommanderVisitor.java
rename to visitor/src/main/java/com/iluwatar/visitor/CommanderVisitor.java
index 63904aa2c99c..8cc2625058bb 100644
--- a/visitor/src/main/java/com/iluwatar/CommanderVisitor.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/CommanderVisitor.java
@@ -1,22 +1,22 @@
-package com.iluwatar;
-
-public class CommanderVisitor implements UnitVisitor {
-
- @Override
- public void visitSoldier(Soldier soldier) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void visitSergeant(Sergeant sergeant) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void visitCommander(Commander commander) {
- System.out.println("Good to see you " + commander);
- }
-
-}
+package com.iluwatar.visitor;
+
+public class CommanderVisitor implements UnitVisitor {
+
+ @Override
+ public void visitSoldier(Soldier soldier) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void visitSergeant(Sergeant sergeant) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void visitCommander(Commander commander) {
+ System.out.println("Good to see you " + commander);
+ }
+
+}
diff --git a/visitor/src/main/java/com/iluwatar/Sergeant.java b/visitor/src/main/java/com/iluwatar/visitor/Sergeant.java
similarity index 87%
rename from visitor/src/main/java/com/iluwatar/Sergeant.java
rename to visitor/src/main/java/com/iluwatar/visitor/Sergeant.java
index f56b3fc7aded..45d0b58f3029 100644
--- a/visitor/src/main/java/com/iluwatar/Sergeant.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/Sergeant.java
@@ -1,19 +1,19 @@
-package com.iluwatar;
-
-public class Sergeant extends Unit {
-
- public Sergeant(Unit ... children) {
- super(children);
- }
-
- @Override
- public void accept(UnitVisitor visitor) {
- visitor.visitSergeant(this);
- super.accept(visitor);
- }
-
- @Override
- public String toString() {
- return "sergeant";
- }
-}
+package com.iluwatar.visitor;
+
+public class Sergeant extends Unit {
+
+ public Sergeant(Unit ... children) {
+ super(children);
+ }
+
+ @Override
+ public void accept(UnitVisitor visitor) {
+ visitor.visitSergeant(this);
+ super.accept(visitor);
+ }
+
+ @Override
+ public String toString() {
+ return "sergeant";
+ }
+}
diff --git a/visitor/src/main/java/com/iluwatar/SergeantVisitor.java b/visitor/src/main/java/com/iluwatar/visitor/SergeantVisitor.java
similarity index 89%
rename from visitor/src/main/java/com/iluwatar/SergeantVisitor.java
rename to visitor/src/main/java/com/iluwatar/visitor/SergeantVisitor.java
index 5257ca4b577c..123db4d9c2bc 100644
--- a/visitor/src/main/java/com/iluwatar/SergeantVisitor.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/SergeantVisitor.java
@@ -1,22 +1,22 @@
-package com.iluwatar;
-
-public class SergeantVisitor implements UnitVisitor {
-
- @Override
- public void visitSoldier(Soldier soldier) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void visitSergeant(Sergeant sergeant) {
- System.out.println("Hello " + sergeant);
- }
-
- @Override
- public void visitCommander(Commander commander) {
- // TODO Auto-generated method stub
-
- }
-
-}
+package com.iluwatar.visitor;
+
+public class SergeantVisitor implements UnitVisitor {
+
+ @Override
+ public void visitSoldier(Soldier soldier) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void visitSergeant(Sergeant sergeant) {
+ System.out.println("Hello " + sergeant);
+ }
+
+ @Override
+ public void visitCommander(Commander commander) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
diff --git a/visitor/src/main/java/com/iluwatar/Soldier.java b/visitor/src/main/java/com/iluwatar/visitor/Soldier.java
similarity index 87%
rename from visitor/src/main/java/com/iluwatar/Soldier.java
rename to visitor/src/main/java/com/iluwatar/visitor/Soldier.java
index 45b9b1554937..b222df076a1f 100644
--- a/visitor/src/main/java/com/iluwatar/Soldier.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/Soldier.java
@@ -1,19 +1,19 @@
-package com.iluwatar;
-
-public class Soldier extends Unit {
-
- public Soldier(Unit ... children) {
- super(children);
- }
-
- @Override
- public void accept(UnitVisitor visitor) {
- visitor.visitSoldier(this);
- super.accept(visitor);
- }
-
- @Override
- public String toString() {
- return "soldier";
- }
-}
+package com.iluwatar.visitor;
+
+public class Soldier extends Unit {
+
+ public Soldier(Unit ... children) {
+ super(children);
+ }
+
+ @Override
+ public void accept(UnitVisitor visitor) {
+ visitor.visitSoldier(this);
+ super.accept(visitor);
+ }
+
+ @Override
+ public String toString() {
+ return "soldier";
+ }
+}
diff --git a/visitor/src/main/java/com/iluwatar/SoldierVisitor.java b/visitor/src/main/java/com/iluwatar/visitor/SoldierVisitor.java
similarity index 89%
rename from visitor/src/main/java/com/iluwatar/SoldierVisitor.java
rename to visitor/src/main/java/com/iluwatar/visitor/SoldierVisitor.java
index fd80d553c1c9..c6b73b76ed08 100644
--- a/visitor/src/main/java/com/iluwatar/SoldierVisitor.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/SoldierVisitor.java
@@ -1,22 +1,22 @@
-package com.iluwatar;
-
-public class SoldierVisitor implements UnitVisitor {
-
- @Override
- public void visitSoldier(Soldier soldier) {
- System.out.println("Greetings " + soldier);
- }
-
- @Override
- public void visitSergeant(Sergeant sergeant) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void visitCommander(Commander commander) {
- // TODO Auto-generated method stub
-
- }
-
-}
+package com.iluwatar.visitor;
+
+public class SoldierVisitor implements UnitVisitor {
+
+ @Override
+ public void visitSoldier(Soldier soldier) {
+ System.out.println("Greetings " + soldier);
+ }
+
+ @Override
+ public void visitSergeant(Sergeant sergeant) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void visitCommander(Commander commander) {
+ // TODO Auto-generated method stub
+
+ }
+
+}
diff --git a/visitor/src/main/java/com/iluwatar/Unit.java b/visitor/src/main/java/com/iluwatar/visitor/Unit.java
similarity index 87%
rename from visitor/src/main/java/com/iluwatar/Unit.java
rename to visitor/src/main/java/com/iluwatar/visitor/Unit.java
index 32cc93ed321c..2eb324fb0643 100644
--- a/visitor/src/main/java/com/iluwatar/Unit.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/Unit.java
@@ -1,21 +1,21 @@
-package com.iluwatar;
-
-/**
- *
- * Interface for the nodes in hierarchy.
- *
- */
-public abstract class Unit {
-
- private Unit[] children;
-
- public Unit(Unit ... children) {
- this.children = children;
- }
-
- public void accept(UnitVisitor visitor) {
- for (Unit child: children) {
- child.accept(visitor);
- }
- }
-}
+package com.iluwatar.visitor;
+
+/**
+ *
+ * Interface for the nodes in hierarchy.
+ *
+ */
+public abstract class Unit {
+
+ private Unit[] children;
+
+ public Unit(Unit ... children) {
+ this.children = children;
+ }
+
+ public void accept(UnitVisitor visitor) {
+ for (Unit child: children) {
+ child.accept(visitor);
+ }
+ }
+}
diff --git a/visitor/src/main/java/com/iluwatar/UnitVisitor.java b/visitor/src/main/java/com/iluwatar/visitor/UnitVisitor.java
similarity index 84%
rename from visitor/src/main/java/com/iluwatar/UnitVisitor.java
rename to visitor/src/main/java/com/iluwatar/visitor/UnitVisitor.java
index 298b9f8cbfc7..64cfce4b5f05 100644
--- a/visitor/src/main/java/com/iluwatar/UnitVisitor.java
+++ b/visitor/src/main/java/com/iluwatar/visitor/UnitVisitor.java
@@ -1,14 +1,14 @@
-package com.iluwatar;
-
-/**
- *
- * Visitor interface.
- *
- */
-public interface UnitVisitor {
-
- void visitSoldier(Soldier soldier);
- void visitSergeant(Sergeant sergeant);
- void visitCommander(Commander commander);
-
-}
+package com.iluwatar.visitor;
+
+/**
+ *
+ * Visitor interface.
+ *
+ */
+public interface UnitVisitor {
+
+ void visitSoldier(Soldier soldier);
+ void visitSergeant(Sergeant sergeant);
+ void visitCommander(Commander commander);
+
+}
diff --git a/visitor/visitor.iml b/visitor/visitor.iml
new file mode 100644
index 000000000000..622a13cd7540
--- /dev/null
+++ b/visitor/visitor.iml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
+ 
+