Skip to content

Commit 0b5f1c3

Browse files
committed
change license to bsd
1 parent 4618316 commit 0b5f1c3

File tree

10 files changed

+74
-131
lines changed

10 files changed

+74
-131
lines changed

src/com/danga/MemCached/ContextObjectInputStream.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
/**
22
* MemCached Java client
3-
* Copyright (c) 2007
3+
* Copyright (c) 2007 Greg Whalin
4+
* All rights reserved.
45
*
56
* This library is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License as published by the Free Software Foundation; either
8-
* version 2.1 of the License, or (at your option) any later
9-
* version.
7+
* modify it under the terms of the BSD license
108
*
119
* This library is distributed in the hope that it will be
1210
* useful, but WITHOUT ANY WARRANTY; without even the implied
1311
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
14-
* PURPOSE. See the GNU Lesser General Public License for more
15-
* details.
16-
*
17-
* You should have received a copy of the GNU Lesser General Public
18-
* License along with this library; if not, write to the Free Software
19-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
12+
* PURPOSE.
2013
*
14+
* You should have received a copy of the BSD License along with this
15+
* library.
2116
*
2217
* Adds the ability for the MemCached client to be initialized
2318
* with a custom class loader. This will allow for the
2419
* deserialization of classes that are not visible to the system
2520
* class loader.
2621
*
2722
* @author Vin Chawla <[email protected]>
28-
* @version 1.5
23+
* @version 1.5.2
2924
*/
3025
package com.danga.MemCached;
3126

src/com/danga/MemCached/Logger.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
11
/**
22
* MemCached Java Client Logger
3-
* Copyright (c) 2007
4-
*
5-
* This module is Copyright (c) 2005 Greg Whalin
3+
* Copyright (c) 2007 Greg Whalin
64
* All rights reserved.
75
*
86
* This library is free software; you can redistribute it and/or
9-
* modify it under the terms of the GNU Lesser General Public
10-
* License as published by the Free Software Foundation; either
11-
* version 2.1 of the License, or (at your option) any later
12-
* version.
7+
* modify it under the terms of the BSD license
138
*
149
* This library is distributed in the hope that it will be
1510
* useful, but WITHOUT ANY WARRANTY; without even the implied
1611
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
17-
* PURPOSE. See the GNU Lesser General Public License for more
18-
* details.
12+
* PURPOSE.
1913
*
20-
* You should have received a copy of the GNU Lesser General Public
21-
* License along with this library; if not, write to the Free Software
22-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
14+
* You should have received a copy of the BSD License along with this
15+
* library.
2316
*
2417
* @author Greg Whalin <[email protected]>
25-
* @version 1.5
18+
* @version 1.5.2
2619
*/
2720
package com.danga.MemCached;
2821

src/com/danga/MemCached/MemCachedClient.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,25 @@
11
/**
22
* MemCached Java client
3-
* Copyright (c) 2007
4-
*
5-
* This module is Copyright (c) 2007 Greg Whalin, Richard Russo
3+
* Copyright (c) 2007 Greg Whalin
64
* All rights reserved.
75
*
86
* This library is free software; you can redistribute it and/or
9-
* modify it under the terms of the GNU Lesser General Public
10-
* License as published by the Free Software Foundation; either
11-
* version 2.1 of the License, or (at your option) any later
12-
* version.
7+
* modify it under the terms of the BSD license
138
*
149
* This library is distributed in the hope that it will be
1510
* useful, but WITHOUT ANY WARRANTY; without even the implied
1611
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
17-
* PURPOSE. See the GNU Lesser General Public License for more
18-
* details.
12+
* PURPOSE.
1913
*
20-
* You should have received a copy of the GNU Lesser General Public
21-
* License along with this library; if not, write to the Free Software
22-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
14+
* You should have received a copy of the BSD License along with this
15+
* library.
2316
*
2417
* @author Greg Whalin <[email protected]>
2518
* @author Richard 'toast' Russo <[email protected]>
2619
* @author Kevin Burton <[email protected]>
2720
* @author Robert Watts <[email protected]>
2821
* @author Vin Chawla <[email protected]>
29-
* @version 1.5
22+
* @version 1.5.2
3023
*/
3124
package com.danga.MemCached;
3225

src/com/danga/MemCached/NativeHandler.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
/**
22
* MemCached Java client
3-
* Copyright (c) 2007
3+
* Copyright (c) 2007 Greg Whalin
4+
* All rights reserved.
45
*
56
* This library is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License as published by the Free Software Foundation; either
8-
* version 2.1 of the License, or (at your option) any later
9-
* version.
7+
* modify it under the terms of the BSD license
108
*
119
* This library is distributed in the hope that it will be
1210
* useful, but WITHOUT ANY WARRANTY; without even the implied
1311
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
14-
* PURPOSE. See the GNU Lesser General Public License for more
15-
* details.
12+
* PURPOSE.
1613
*
17-
* You should have received a copy of the GNU Lesser General Public
18-
* License along with this library; if not, write to the Free Software
19-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
14+
* You should have received a copy of the BSD License along with this
15+
* library.
2016
*
2117
* @author Kevin A. Burton <[email protected]>
2218
* @author Greg Whalin <[email protected]>
23-
* @version 1.5
19+
* @version 1.5.2
2420
*/
2521
package com.danga.MemCached;
2622

src/com/danga/MemCached/NestedIOException.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
/**
22
* MemCached Java client
3-
* Copyright (c) 2007
3+
* Copyright (c) 2007 Greg Whalin
4+
* All rights reserved.
45
*
56
* This library is free software; you can redistribute it and/or
6-
* modify it under the terms of the GNU Lesser General Public
7-
* License as published by the Free Software Foundation; either
8-
* version 2.1 of the License, or (at your option) any later
9-
* version.
7+
* modify it under the terms of the BSD license
108
*
119
* This library is distributed in the hope that it will be
1210
* useful, but WITHOUT ANY WARRANTY; without even the implied
1311
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
14-
* PURPOSE. See the GNU Lesser General Public License for more
15-
* details.
12+
* PURPOSE.
1613
*
17-
* You should have received a copy of the GNU Lesser General Public
18-
* License along with this library; if not, write to the Free Software
19-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
14+
* You should have received a copy of the BSD License along with this
15+
* library.
2016
*
2117
* @author Kevin A. Burton <[email protected]>
22-
* @version 1.5
18+
* @version 1.5.2
2319
*/
2420
package com.danga.MemCached;
2521

src/com/danga/MemCached/SockIOPool.java

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,22 @@
11
/**
22
* MemCached Java client, connection pool for Socket IO
3-
* Copyright (c) 2007
4-
*
5-
* This module is Copyright (c) 2007 Greg Whalin, Richard Russo
3+
* Copyright (c) 2007 Greg Whalin
64
* All rights reserved.
75
*
86
* This library is free software; you can redistribute it and/or
9-
* modify it under the terms of the GNU Lesser General Public
10-
* License as published by the Free Software Foundation; either
11-
* version 2.1 of the License, or (at your option) any later
12-
* version.
7+
* modify it under the terms of the BSD license
138
*
149
* This library is distributed in the hope that it will be
1510
* useful, but WITHOUT ANY WARRANTY; without even the implied
1611
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
17-
* PURPOSE. See the GNU Lesser General Public License for more
18-
* details.
12+
* PURPOSE.
1913
*
20-
* You should have received a copy of the GNU Lesser General Public
21-
* License along with this library; if not, write to the Free Software
22-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
14+
* You should have received a copy of the BSD License along with this
15+
* library.
2316
*
2417
* @author greg whalin <[email protected]>
2518
* @author Richard 'toast' Russo <[email protected]>
26-
*
27-
* @version 1.5
19+
* @version 1.5.2
2820
*/
2921
package com.danga.MemCached;
3022

src/com/danga/MemCached/test/MemCachedBench.java

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,21 @@
11
/**
22
* MemCachedBench.java
3-
*
4-
* Copyright (c) 2005
5-
* Greg Whalin <[email protected]>
6-
*
7-
* See the memcached website:
8-
* http://www.danga.com/memcached/
9-
*
10-
* This module is Copyright (c) 2005 Greg Whalin.
3+
* Copyright (c) 2007 Greg Whalin
114
* All rights reserved.
125
*
136
* This library is free software; you can redistribute it and/or
14-
* modify it under the terms of the GNU Lesser General Public
15-
* License as published by the Free Software Foundation; either
16-
* version 2.1 of the License, or (at your option) any later
17-
* version.
7+
* modify it under the terms of the BSD license
188
*
199
* This library is distributed in the hope that it will be
2010
* useful, but WITHOUT ANY WARRANTY; without even the implied
2111
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
22-
* PURPOSE. See the GNU Lesser General Public License for more
23-
* details.
12+
* PURPOSE.
2413
*
25-
* You should have received a copy of the GNU Lesser General Public
26-
* License along with this library; if not, write to the Free Software
27-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
14+
* You should have received a copy of the BSD License along with this
15+
* library.
2816
*
2917
* @author Greg Whalin <[email protected]>
30-
* @version 1.2
18+
* @version 1.5.2
3119
*/
3220
package com.danga.MemCached.test;
3321

src/com/danga/MemCached/test/MemCachedTest.java

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,21 @@
11
/**
22
* MemCachedTest.java
3-
* Test class for testing memcached java client.
4-
*
5-
* Copyright (c) 2005
6-
* Greg Whalin <[email protected]>
7-
*
8-
* See the memcached website:
9-
* http://www.danga.com/memcached/
10-
*
11-
* This module is Copyright (c) 2005 Greg Whalin.
3+
* Copyright (c) 2007 Greg Whalin
124
* All rights reserved.
135
*
146
* This library is free software; you can redistribute it and/or
15-
* modify it under the terms of the GNU Lesser General Public
16-
* License as published by the Free Software Foundation; either
17-
* version 2.1 of the License, or (at your option) any later
18-
* version.
7+
* modify it under the terms of the BSD license
198
*
209
* This library is distributed in the hope that it will be
2110
* useful, but WITHOUT ANY WARRANTY; without even the implied
2211
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
23-
* PURPOSE. See the GNU Lesser General Public License for more
24-
* details.
12+
* PURPOSE.
2513
*
26-
* You should have received a copy of the GNU Lesser General Public
27-
* License along with this library; if not, write to the Free Software
28-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
14+
* You should have received a copy of the BSD License along with this
15+
* library.
2916
*
3017
* @author Greg Whalin <[email protected]>
31-
* @version 1.2
18+
* @version 1.5.2
3219
*/
3320
package com.danga.MemCached.test;
3421

src/com/danga/MemCached/test/TestMemcached.java

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,22 @@
11
/**
2-
* * Test case to test memcached Java client failover when server list includes a server that is down
3-
* */
2+
* MemCached Java client
3+
* Copyright (c) 2007 Greg Whalin
4+
* All rights reserved.
5+
*
6+
* This library is free software; you can redistribute it and/or
7+
* modify it under the terms of the BSD license
8+
*
9+
* This library is distributed in the hope that it will be
10+
* useful, but WITHOUT ANY WARRANTY; without even the implied
11+
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
12+
* PURPOSE.
13+
*
14+
* You should have received a copy of the BSD License along with this
15+
* library.
16+
*
17+
* @author greg whalin <[email protected]>
18+
* @version 1.5.2
19+
*/
420
package com.danga.MemCached.test;
521

622
import com.danga.MemCached.*;

src/com/danga/MemCached/test/UnitTests.java

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,18 @@
11
/**
22
* UnitTests.java
3-
* Test class for testing memcached java client.
4-
*
5-
* Copyright (c) 2005
6-
* Kevin Burton
7-
*
8-
* See the memcached website:
9-
* http://www.danga.com/memcached/
10-
*
11-
* This module is Copyright (c) 2005 Kevin Burton
3+
* Copyright (c) 2007 Greg Whalin
124
* All rights reserved.
135
*
146
* This library is free software; you can redistribute it and/or
15-
* modify it under the terms of the GNU Lesser General Public
16-
* License as published by the Free Software Foundation; either
17-
* version 2.1 of the License, or (at your option) any later
18-
* version.
7+
* modify it under the terms of the BSD license
198
*
209
* This library is distributed in the hope that it will be
2110
* useful, but WITHOUT ANY WARRANTY; without even the implied
2211
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
23-
* PURPOSE. See the GNU Lesser General Public License for more
24-
* details.
12+
* PURPOSE.
2513
*
26-
* You should have received a copy of the GNU Lesser General Public
27-
* License along with this library; if not, write to the Free Software
28-
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
14+
* You should have received a copy of the BSD License along with this
15+
* library.
2916
*
3017
* @author Kevin Burton
3118
* @author greg whalin <[email protected]>

0 commit comments

Comments
 (0)