Skip to content

Commit

Permalink
Merge pull request #11 from glassdb/master
Browse files Browse the repository at this point in the history
Synchronize with Zinc 2.4.3
  • Loading branch information
svenvc committed Jul 4, 2013
2 parents e417582 + fbdd79d commit 50dd285
Show file tree
Hide file tree
Showing 760 changed files with 3,720 additions and 776 deletions.
24 changes: 24 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
language: erlang

env:
- ST=PharoCore-1.3
- ST=Pharo-1.4
- ST=Pharo-2.0
# - ST=Pharo-3.0

# blacklist master as it is the "shared code" branch
branches:
except:
- master

install:
- export PROJECT_HOME="$(pwd)"
- cd $HOME
- wget -q -O builderCI.zip https://github.com/dalehenrich/builderCI/zipball/master
- unzip -q builderCI.zip
- cd dalehenrich-builderCI*
- source build_env_vars
- ln -s $PROJECT_HOME $GIT_PATH
- ./build_image.sh

script: $BUILDER_CI_HOME/testTravisCI.sh # -verbose
28 changes: 28 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,31 @@ to deal with the HTTP networking protocol.


[MIT Licensed](https://github.com/svenvc/zinc/blob/master/license.txt)

## Loading into GemStone

1. [Upgrade to GLASS 1.0-beta.9](http://code.google.com/p/glassdb/wiki/GemToolsUpdate#Update_GLASS)

2. Install Zinc:

```Smalltalk
"GemStone 2.4"
Metacello new
baseline: 'Zinc';
repository: 'github://glassdb/zinc:gemstone2.4/repository';
load: 'Tests'.
"GemStone 3.1"
Metacello new
baseline: 'Zinc';
repository: 'github://glassdb/zinc:gemstone3.1/repository';
load: 'Tests'.
```
*See the [Releases page](https://github.com/glassdb/zinc/releases/) for instructions for installing specific Zinc releases.*
## Travis Status
**GemStone2.4.x** [![Build Status](https://travis-ci.org/glassdb/zinc.png?branch=gemstone2.4)](https://travis-ci.org/glassdb/zinc)
**GemStone3.1.x** [![Build Status](https://travis-ci.org/glassdb/zinc.png?branch=gemstone3.1)](https://travis-ci.org/glassdb/zinc)
4 changes: 4 additions & 0 deletions repository/BaselineOfZincHTTPComponents.package/.filetree
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"noMethodMetaData" : true,
"separateMethodMetaAndSource" : false,
"useCypressPropertiesFile" : true }
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
baseline
baseline: spec
<baseline>
spec
for: #'common'
do: [
spec
project: 'XML Support'
with: [
spec
className: 'ConfigurationOfXMLSupport';
versionString: #'stable';
repository: 'http://www.squeaksource.com/MetacelloRepository' ].
spec
project: 'Neo JSON'
with: [
spec
className: 'ConfigurationOfNeoJSON';
versionString: #'stable';
repository: 'http://mc.stfx.eu/Neo' ].
spec
package: 'Zodiac-Core'
with: [ spec repository: 'http://mc.stfx.eu/Zodiac' ].
spec
package: 'Zodiac-Tests'
with: [ spec repository: 'http://mc.stfx.eu/Zodiac' ].
spec
package: 'Zinc-Character-Encoding-Core';
package: 'Zinc-Character-Encoding-Tests'
with: [ spec requires: 'Zinc-Character-Encoding-Core' ];
package: 'Zinc-Resource-Meta-Core'
with: [ spec requires: 'Zinc-Character-Encoding-Core' ];
package: 'Zinc-Resource-Meta-Tests'
with: [ spec requires: 'Zinc-Resource-Meta-Core' ];
package: 'Zinc-HTTP'
with: [ spec requires: #('Zinc-Character-Encoding-Core' 'Zinc-Resource-Meta-Core') ];
package: 'Zinc-Patch-HTTPSocket' with: [ spec requires: 'Zinc-HTTP' ];
package: 'Zinc-AWS'
with: [ spec requires: #('Zinc-HTTP' 'XML Support') ];
package: 'Zinc-REST' with: [ spec requires: #('Zinc-HTTP' 'Neo JSON') ];
package: 'Zinc-Zodiac'
with: [ spec requires: #('Zinc-HTTP' 'Zodiac-Core' 'Zodiac-Tests') ];
package: 'Zinc-WebSocket-Core' with: [ spec requires: 'Zinc-HTTP' ];
package: 'Zinc-WebSocket-Tests'
with: [ spec requires: 'Zinc-WebSocket-Core' ];
package: 'Zinc-SSO-OAuth1-Core'
with: [ spec requires: #('Zinc-HTTP' 'Neo JSON') ];
package: 'Zinc-SSO-OAuth2-Core'
with: [ spec requires: #('Zinc-HTTP' 'Neo JSON') ];
package: 'Zinc-SSO-OpenID-Core'
with: [ spec requires: #('Zinc-HTTP' 'XML Support') ];
package: 'Zinc-SSO-Demo'
with: [
spec
requires:
#('Zinc-SSO-OAuth1-Core' 'Zinc-SSO-OAuth2-Core' 'Zinc-SSO-OpenID-Core') ];
package: 'Zinc-SSO-OAuth1-Tests'
with: [ spec requires: #('Zinc-SSO-OAuth1-Core') ];
package: 'Zinc-SSO-OpenID-Tests'
with: [ spec requires: #('Zinc-SSO-OpenID-Core') ];
package: 'Zinc-WebDAV' with: [ spec requires: 'Zinc-HTTP' ];
package: 'Zinc-WWS-Server' with: [ spec requires: 'Zinc-HTTP' ];
package: 'Zinc-WWS-Client' with: [ spec requires: 'Zinc-HTTP' ];
package: 'Zinc-Tests' with: [ spec requires: 'Zinc-HTTP' ];
package: 'Zinc-Seaside'. "For now, no dependence on Seaside itself"
spec
group: 'default' with: #('Core');
group: 'Core' with: #('Zinc-HTTP');
group: 'Tests'
with:
#('Zinc-Tests' 'Zinc-Character-Encoding-Tests' 'Zinc-Resource-Meta-Tests');
group: 'Character-Encoding'
with:
#('Zinc-Character-Encoding-Core' 'Zinc-Character-Encoding-Tests');
group: 'Resource-Meta'
with: #('Zinc-Resource-Meta-Core' 'Zinc-Resource-Meta-Tests');
group: 'Zodiac' with: #('Zinc-Zodiac');
group: 'AWS' with: #('Zinc-AWS');
group: 'WebDAV' with: #('Zinc-WebDAV');
group: 'WebSocket'
with: #('Zinc-WebSocket-Core' 'Zinc-WebSocket-Tests');
group: 'SSO-OAuth1'
with: #('Zinc-SSO-OAuth1-Core' 'Zinc-SSO-OAuth1-Tests');
group: 'SSO-OAuth2' with: #('Zinc-SSO-OAuth2-Core');
group: 'SSO-OpenID'
with: #('Zinc-SSO-OpenID-Core' 'Zinc-SSO-OpenID-Tests');
group: 'SSO-Demo'
with:
#('Zinc-SSO-OAuth1-Core' 'Zinc-SSO-OAuth2-Core' 'Zinc-SSO-OpenID-Core');
group: 'SSO'
with:
#('SSO-OAuth1' 'SSO-OAuth2' 'SSO-OpenID' 'SSO-Demo' 'Zinc-SSO-Demo');
group: 'WWS' with: #('Zinc-WWS-Server' 'Zinc-WWS-Client');
group: 'REST' with: #('Zinc-REST');
group: 'Patch-HTTPSocket' with: #('Zinc-Patch-HTTPSocket');
group: 'Seaside' with: #('Zinc-Seaside') ].
spec
for: #'pharo1.x'
do: [
spec
package: 'Zinc-Patch-HTTPSocket'
with: [ spec file: 'Zinc-Patch-HTTPSocket.pharo1x' ];
package: 'Zinc-FileSystem-Legacy';
package: 'Zinc-Pharo-Forward-Compatibility';
package: 'Zinc-HTTP'
with: [ spec requires: #('Zinc-FileSystem-Legacy' 'Zinc-Pharo-Forward-Compatibility') ] ].
spec
for: #'pharo2.x'
do: [
spec
package: 'Zinc-FileSystem';
package: 'Zinc-HTTP' with: [ spec requires: 'Zinc-FileSystem' ] ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"class" : {
},
"instance" : {
"baseline:" : "dkh 07/02/2013 22:44" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"category" : "BaselineOfZincHTTPComponents",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
],
"name" : "BaselineOfZincHTTPComponents",
"pools" : [
],
"super" : "BaselineOf",
"type" : "normal" }
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SystemOrganization addCategory: 'BaselineOfZincHTTPComponents'!
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(name 'BaselineOfZincHTTPComponents')
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(name 'BaselineOfZincHTTPComponents-dkh.2' message 'add Zinc-Patch-HTTPSocket.pharo1x pacakge' id '6ed3a344-2cc6-4148-98b6-e469172b4945' date '07/02/2013' time '22:45:23' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.1' message 'create BaselineOfZincHTTPComponents' id '538d79c1-e9c4-48be-84fb-1887988f13a8' date '07/02/2013' time '22:30:27' author 'dkh' ancestors () stepChildren ())) stepChildren ())
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
I am ConfigurationOfZincHTTPComponents the Metacello configuration of Zinc HTTP Components, an open-source Smalltalk framework to deal with the HTTP networking protocol.
I am ConfigurationOfZincHTTPComponents, the Metacello configuration of Zinc HTTP Components, an open-source Smalltalk framework to deal with the HTTP networking protocol.

For more information, see http://zn.stfx.eu

Expand All @@ -9,4 +9,22 @@ Here are some ways to load this project:
ConfigurationOfZincHTTPComponents project latestVersion load: 'Tests'.
ConfigurationOfZincHTTPComponents project bleedingEdge load.

Here is a list of available groups:

default - Core
Tests
Character-Encoding
Resource-Meta
Zodiac

AWS
REST
Seaside
WebSocket
SSO - SSO-OAuth1 - SSO-OAuth2 - SSO-OpenID - SSO-Demo

WebDAV
WWS
Patch-HTTPSocket

This is open-source software licensed under the MIT License.
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
baselines
baseline24: spec
<version: '2.4-baseline'>
spec for: #common do: [
spec
blessing: #baseline;
description: 'Baseline for Zinc HTTP Components, a framework to deal with the HTTP networking';
author: 'SvenVanCaekenberghe';
repository: 'http://mc.stfx.eu/ZincHTTPComponents'.
spec project: 'XML Support' with: [
spec
className: 'ConfigurationOfXMLSupport';
versionString: #'stable';
repository: 'http://www.squeaksource.com/MetacelloRepository' ].
spec project: 'Neo JSON' with: [
spec
className: 'ConfigurationOfNeoJSON';
versionString: #'stable';
repository: 'http://mc.stfx.eu/Neo' ].
spec package: 'Zodiac-Core' with: [ spec repository: 'http://mc.stfx.eu/Zodiac' ].
spec package: 'Zodiac-Tests' with: [ spec repository: 'http://mc.stfx.eu/Zodiac' ].
spec
package: 'Zinc-Character-Encoding-Core';
package: 'Zinc-Character-Encoding-Tests' with: [ spec requires: 'Zinc-Character-Encoding-Core' ];
package: 'Zinc-Resource-Meta-Core' with: [ spec requires: 'Zinc-Character-Encoding-Core' ];
package: 'Zinc-Resource-Meta-Tests' with: [ spec requires: 'Zinc-Resource-Meta-Core' ];
package: 'Zinc-HTTP' with: [ spec requires: #( 'Zinc-Character-Encoding-Core' 'Zinc-Resource-Meta-Core' ) ];
package: 'Zinc-Patch-HTTPSocket' with: [ spec requires: 'Zinc-HTTP' ];
package: 'Zinc-AWS' with: [ spec requires: #( 'Zinc-HTTP' 'XML Support' ) ];
package: 'Zinc-REST' with: [ spec requires: #( 'Zinc-HTTP' 'Neo JSON' ) ];
package: 'Zinc-Zodiac' with: [ spec requires: #( 'Zinc-HTTP' 'Zodiac-Core' 'Zodiac-Tests' ) ];
package: 'Zinc-WebSocket-Core' with: [ spec requires: 'Zinc-HTTP' ];
package: 'Zinc-WebSocket-Tests' with: [ spec requires: 'Zinc-WebSocket-Core' ];
package: 'Zinc-SSO-OAuth1-Core' with: [ spec requires: #( 'Zinc-HTTP' 'Neo JSON' ) ];
package: 'Zinc-SSO-OAuth2-Core' with: [ spec requires: #( 'Zinc-HTTP' 'Neo JSON' ) ];
package: 'Zinc-SSO-OpenID-Core' with: [ spec requires: #( 'Zinc-HTTP' 'XML Support' ) ];
package: 'Zinc-SSO-Demo' with: [ spec requires: #( 'Zinc-SSO-OAuth1-Core' 'Zinc-SSO-OAuth2-Core' 'Zinc-SSO-OpenID-Core' ) ];
package: 'Zinc-SSO-OAuth1-Tests' with: [ spec requires: #( 'Zinc-SSO-OAuth1-Core' ) ];
package: 'Zinc-SSO-OpenID-Tests' with: [ spec requires: #( 'Zinc-SSO-OpenID-Core' ) ];
package: 'Zinc-WebDAV' with: [ spec requires: 'Zinc-HTTP' ];
package: 'Zinc-WWS-Server' with: [ spec requires: 'Zinc-HTTP' ];
package: 'Zinc-WWS-Client' with: [ spec requires: 'Zinc-HTTP' ];
package: 'Zinc-Tests' with: [ spec requires: 'Zinc-HTTP' ];
package: 'Zinc-Seaside'. "For now, no dependence on Seaside itself"
spec
group: 'default' with: #('Core');
group: 'Core' with: #('Zinc-HTTP');
group: 'Tests' with: #('Zinc-Tests' 'Zinc-Character-Encoding-Tests' 'Zinc-Resource-Meta-Tests');
group: 'Character-Encoding' with: #('Zinc-Character-Encoding-Core' 'Zinc-Character-Encoding-Tests');
group: 'Resource-Meta' with: #('Zinc-Resource-Meta-Core' 'Zinc-Resource-Meta-Tests');
group: 'Zodiac' with: #('Zinc-Zodiac');
group: 'AWS' with: #('Zinc-AWS');
group: 'WebDAV' with: #('Zinc-WebDAV');
group: 'WebSocket' with: #('Zinc-WebSocket-Core' 'Zinc-WebSocket-Tests');
group: 'SSO-OAuth1' with: #('Zinc-SSO-OAuth1-Core' 'Zinc-SSO-OAuth1-Tests');
group: 'SSO-OAuth2' with: #('Zinc-SSO-OAuth2-Core');
group: 'SSO-OpenID' with: #('Zinc-SSO-OpenID-Core' 'Zinc-SSO-OpenID-Tests');
group: 'SSO-Demo' with: #('Zinc-SSO-OAuth1-Core' 'Zinc-SSO-OAuth2-Core' 'Zinc-SSO-OpenID-Core');
group: 'SSO' with: #('SSO-OAuth1' 'SSO-OAuth2' 'SSO-OpenID' 'SSO-Demo' 'Zinc-SSO-Demo');
group: 'WWS' with: #('Zinc-WWS-Server' 'Zinc-WWS-Client');
group: 'REST' with: #('Zinc-REST');
group: 'Patch-HTTPSocket' with: #('Zinc-Patch-HTTPSocket');
group: 'Seaside' with: #('Zinc-Seaside') ].
spec for: #'pharo1.x' do: [
spec
package: 'Zinc-FileSystem-Legacy';
package: 'Zinc-Pharo-Forward-Compatibility';
package: 'Zinc-HTTP' with: [ spec requires: #('Zinc-FileSystem-Legacy' 'Zinc-Pharo-Forward-Compatibility') ] ].
spec for: #'pharo2.x' do: [
spec
package: 'Zinc-FileSystem';
package: 'Zinc-HTTP' with: [ spec requires: 'Zinc-FileSystem' ] ].
spec for: #gemstone do: [
spec
repository: 'http://seaside.gemstone.com/ss/ZincHTTPComponents';
package: 'Zinc-HTTP' with: [ spec includes: #('Zinc-Gemstone') ];
package: 'SocketStream' with: [ spec repository: 'http://seaside.gemstone.com/ss/PharoCompat' ];
package: 'Zinc-GemstonePreliminary' with: [ spec requires: #('SocketStream') ];
package: 'Zinc-HTTP' with: [ spec requires: #('Zinc-GemstonePreliminary') ];
package: 'Zinc-Gemstone' with: [ spec requires: #('Zinc-HTTP') ];
package: 'Zinc-Tests' with: [ spec requires: 'Zinc-Gemstone' ] ]
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
accessing
stable: spec
<symbolicVersion: #stable>
spec for: #pharo version: '2.3.2'.
spec for: #'pharo2.x' version: '2.3.2'.
spec for: #pharo version: '2.4.3'.
spec for: #'pharo2.x' version: '2.4.3'.
spec for: #'pharo3.x' version: '2.4.3'.
spec for: #gemstone version: '1.1'
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
versions
version233: spec
<version: '2.3.3' imports: #('2.3-baseline')>
spec for: #common do: [
spec
blessing: #release;
description: 'Update to latest package versions';
author: 'SvenVanCaekenberghe';
package: 'Zinc-Character-Encoding-Core' with: 'Zinc-Character-Encoding-Core-SvenVanCaekenberghe.5';
package: 'Zinc-Character-Encoding-Tests' with: 'Zinc-Character-Encoding-Tests-SvenVanCaekenberghe.3';
package: 'Zinc-Resource-Meta-Core' with: 'Zinc-Resource-Meta-Core-SvenVanCaekenberghe.10';
package: 'Zinc-Resource-Meta-Tests' with: 'Zinc-Resource-Meta-Tests-SvenVanCaekenberghe.7';
package: 'Zinc-HTTP' with: 'Zinc-HTTP-SvenVanCaekenberghe.345';
package: 'Zinc-Tests' with: 'Zinc-Tests-SvenVanCaekenberghe.176';
package: 'Zinc-AWS' with: 'Zinc-AWS-SvenVanCaekenberghe.16';
package: 'Zinc-REST' with: 'Zinc-REST-SvenVanCaekenberghe.10';
package: 'Zinc-WebDAV' with: 'Zinc-WebDAV-SvenVanCaekenberghe.3';
package: 'Zinc-WebSocket-Core' with: 'Zinc-WebSocket-Core-SvenVanCaekenberghe.25';
package: 'Zinc-WebSocket-Tests' with: 'Zinc-WebSocket-Tests-SvenVanCaekenberghe.7';
package: 'Zinc-SSO-OAuth1-Core' with: 'Zinc-SSO-OAuth1-Core-SvenVanCaekenberghe.12';
package: 'Zinc-SSO-OAuth2-Core' with: 'Zinc-SSO-OAuth2-Core-JanVanDeSandt.13';
package: 'Zinc-SSO-OpenID-Core' with: 'Zinc-SSO-OpenID-Core-JanVanDeSandt.6';
package: 'Zinc-SSO-Demo' with: 'Zinc-SSO-Demo-SvenVanCaekenberghe.4';
package: 'Zinc-SSO-OAuth1-Tests' with: 'Zinc-SSO-OAuth1-Tests-SvenVanCaekenberghe.2';
package: 'Zinc-SSO-OpenID-Tests' with: 'Zinc-SSO-OpenID-Tests-JanVanDeSandt.3';
package: 'Zinc-WWS-Client' with: 'Zinc-WWS-Client-SvenVanCaekenberghe.2';
package: 'Zinc-WWS-Server' with: 'Zinc-WWS-Server-SvenVanCaekenberghe.8';
package: 'Zinc-Zodiac' with: 'Zinc-Zodiac-SvenVanCaekenberghe.25';
package: 'Zodiac-Core' with: 'Zodiac-Core-SvenVanCaekenberghe.27';
package: 'Zodiac-Tests' with: 'Zodiac-Tests-SvenVanCaekenberghe.10' ].
spec for: #'pharo1.x' do: [
spec
package: 'Zinc-Patch-HTTPSocket' with: 'Zinc-Patch-HTTPSocket-SvenVanCaekenberghe.1';
package: 'Zinc-FileSystem-Legacy' with: 'Zinc-FileSystem-Legacy-SvenVanCaekenberghe.5';
package: 'Zinc-Pharo-Forward-Compatibility' with: 'Zinc-Pharo-Forward-Compatibility-SvenVanCaekenberghe.1' ].
spec for: #'pharo2.x' do: [
spec
package: 'Zinc-Patch-HTTPSocket' with: 'Zinc-Patch-HTTPSocket-MarcusDenker.4';
package: 'Zinc-FileSystem' with: 'Zinc-FileSystem-SvenVanCaekenberghe.9' ].
spec for: #gemstone do: [
spec blessing: #release.
spec
package: 'Zinc-GemstonePreliminary' with: 'Zinc-GemstonePreliminary-PaulDeBruicker.2';
package: 'Zinc-Gemstone' with: 'Zinc-Gemstone-PaulDeBruicker.14';
package: 'SocketStream' with: 'SocketStream-PaulDeBruicker.12' ]
Loading

0 comments on commit 50dd285

Please sign in to comment.