syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1478700 - in /syncope/branches/1_1_X: ./ common/src/main/java/org/apache/syncope/common/to/ common/src/main/java/org/apache/syncope/common/types/ console/src/main/java/org/apache/syncope/console/pages/panels/ console/src/main/java/org/apac...
Date Fri, 03 May 2013 09:52:25 GMT
Author: ilgrosso
Date: Fri May  3 09:52:24 2013
New Revision: 1478700

URL: http://svn.apache.org/r1478700
Log:
Merge from 1_0_X

Modified:
    syncope/branches/1_1_X/   (props changed)
    syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/BulkAction.java
    syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/BulkActionRes.java
    syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/types/MappingPurpose.java
    syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
    syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/markup/head/MetaHeaderItem.java

Propchange: syncope/branches/1_1_X/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_0_X:r1471498-1478698

Modified: syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/BulkAction.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/BulkAction.java?rev=1478700&r1=1478699&r2=1478700&view=diff
==============================================================================
--- syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/BulkAction.java
(original)
+++ syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/BulkAction.java
Fri May  3 09:52:24 2013
@@ -1,17 +1,20 @@
 /*
- * Copyright 2013 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.syncope.common.to;
 
@@ -26,6 +29,8 @@ import org.apache.syncope.common.Abstrac
 @XmlType
 public class BulkAction extends AbstractBaseBean {
 
+    private static final long serialVersionUID = 1395353278878758961L;
+
     @XmlEnum
     @XmlType(name = "bulkActionType")
     public enum Type {

Modified: syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/BulkActionRes.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/BulkActionRes.java?rev=1478700&r1=1478699&r2=1478700&view=diff
==============================================================================
--- syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/BulkActionRes.java
(original)
+++ syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/to/BulkActionRes.java
Fri May  3 09:52:24 2013
@@ -1,17 +1,20 @@
 /*
- * Copyright 2013 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.syncope.common.to;
 
@@ -29,6 +32,8 @@ import org.codehaus.jackson.annotate.Jso
 @XmlType
 public class BulkActionRes extends AbstractBaseBean {
 
+    private static final long serialVersionUID = 2868894178821778133L;
+
     @XmlEnum
     @XmlType(name = "bulkActionStatus")
     public enum Status {
@@ -71,7 +76,7 @@ public class BulkActionRes extends Abstr
     }
 
     @JsonIgnore
-    public List getResultByStatus(final Status status) {
+    public List<String> getResultByStatus(final Status status) {
         final List<String> res = new ArrayList<String>();
         if (results != null) {
             for (Result result : results) {
@@ -83,7 +88,9 @@ public class BulkActionRes extends Abstr
         return res;
     }
 
-    public static class Result {
+    public static class Result extends AbstractBaseBean {
+
+        private static final long serialVersionUID = -1149681964161193232L;
 
         private String key;
 

Modified: syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/types/MappingPurpose.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/types/MappingPurpose.java?rev=1478700&r1=1478699&r2=1478700&view=diff
==============================================================================
--- syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/types/MappingPurpose.java
(original)
+++ syncope/branches/1_1_X/common/src/main/java/org/apache/syncope/common/types/MappingPurpose.java
Fri May  3 09:52:24 2013
@@ -1,17 +1,20 @@
 /*
- * Copyright 2013 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.syncope.common.types;
 

Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java?rev=1478700&r1=1478699&r2=1478700&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
(original)
+++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
Fri May  3 09:52:24 2013
@@ -1,17 +1,20 @@
 /*
- * Copyright 2013 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.syncope.console.pages.panels;
 
@@ -53,7 +56,7 @@ public class AjaxDataTablePanel<T, S> ex
 
     private final Form bulkActionForm;
 
-    private final AjaxFallbackDefaultDataTable dataTable;
+    private final AjaxFallbackDefaultDataTable<T, S> dataTable;
 
     public AjaxDataTablePanel(
             final String id,
@@ -64,7 +67,7 @@ public class AjaxDataTablePanel<T, S> ex
 
         this.bulkActionForm = null;
         this.group = null;
-        dataTable = new AjaxFallbackDefaultDataTable("dataTable", columns, dataProvider,
rowsPerPage);
+        dataTable = new AjaxFallbackDefaultDataTable<T, S>("dataTable", columns, dataProvider,
rowsPerPage);
 
         Fragment fragment = new Fragment("tablePanel", "bulkNotAvailable", this);
         fragment.add(dataTable);
@@ -127,10 +130,11 @@ public class AjaxDataTablePanel<T, S> ex
         bulkActionForm.add(group);
 
         columns.add(0, new CheckGroupColumn<T, S>(group));
-        dataTable = new AjaxFallbackDefaultDataTable("dataTable", columns, dataProvider,
rowsPerPage);
+        dataTable = new AjaxFallbackDefaultDataTable<T, S>("dataTable", columns, dataProvider,
rowsPerPage);
         group.add(dataTable);
 
         fragment.add(new ClearIndicatingAjaxButton("bulkActionLink", bulkActionForm, pageRef)
{
+
             private static final long serialVersionUID = 382302811235019988L;
 
             @Override
@@ -141,7 +145,7 @@ public class AjaxDataTablePanel<T, S> ex
 
                     @Override
                     public Page createPage() {
-                        return new BulkActionModalPage(
+                        return new BulkActionModalPage<T, S>(
                                 getPage().getPageReference(),
                                 bulkModalWin,
                                 new ArrayList<T>(group.getModelObject()),

Modified: syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/markup/head/MetaHeaderItem.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/markup/head/MetaHeaderItem.java?rev=1478700&r1=1478699&r2=1478700&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/markup/head/MetaHeaderItem.java
(original)
+++ syncope/branches/1_1_X/console/src/main/java/org/apache/syncope/markup/head/MetaHeaderItem.java
Fri May  3 09:52:24 2013
@@ -1,17 +1,20 @@
 /*
- * Copyright 2013 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.syncope.markup.head;
 



Mime
View raw message