January 2012 - jbosstools-commits

JBoss Tools SVN: r38014 - in trunk/tests: plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2012-01-20 20:54:22 -0500 (Fri, 20 Jan 2012) New Revision: 38014 Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/Debug.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ErrorHandlerImpl.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JUnitUtils.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ProjectImportTestSetup.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/SwtUtils.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescription.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescriptionFactory.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/WorkbenchUtils.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/XMLEntityResolver.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/XMLUtilities.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractPluginsLoadTest.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractRuntimeTest.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/IMarkerFilter.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/ImportProvider.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/PreferencePageTest.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/TestSuiteWithParams.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/TestsPlugin.java Log: JBIDE-8997 CLONE - 2010 in the copyright headers should be replaced by 2011 fixed copyright comment and date for tests component Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml =================================================================== --- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2012-01-21 01:54:22 UTC (rev 38014) @@ -6,7 +6,7 @@ </description> <copyright> - Copyright (c) 2007-2011 Exadel, Inc and Red Hat, Inc. + Copyright (c) 2007-2012 Exadel, Inc and Red Hat, Inc. Distributed under license by Red Hat, Inc. All rights reserved. This program is made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/resource/ResourceFactory.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.test.resource; import java.io.IOException; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/Debug.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/Debug.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/Debug.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.test.util; import org.eclipse.core.runtime.Platform; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ErrorHandlerImpl.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ErrorHandlerImpl.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ErrorHandlerImpl.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007-2012 Exadel, Inc. and Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JUnitUtils.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JUnitUtils.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JUnitUtils.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,13 +1,13 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.test.util; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/JobUtils.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,14 +1,13 @@ /******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. + * Copyright (c) 2007-2012 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Red Hat, Inc. - initial API and implementation + * Red Hat, Inc. - initial API and implementation ******************************************************************************/ - package org.jboss.tools.test.util; import org.eclipse.core.runtime.jobs.Job; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.test.util; import org.eclipse.jface.preference.PreferenceDialog; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ProjectImportTestSetup.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,12 +1,12 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.test.util; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,12 +1,12 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.test.util; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/SwtUtils.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/SwtUtils.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/SwtUtils.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,13 +1,13 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.test.util; import org.eclipse.swt.widgets.Composite; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescription.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescription.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescription.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,12 +1,12 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.test.util; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescriptionFactory.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescriptionFactory.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescriptionFactory.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,12 +1,12 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.test.util; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,12 +1,12 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.test.util; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/WorkbenchUtils.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/WorkbenchUtils.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/WorkbenchUtils.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,12 +1,12 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.test.util; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/XMLEntityResolver.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/XMLEntityResolver.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/XMLEntityResolver.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,8 +1,13 @@ -/* - * XMLEntityResolver.java - * Created on February 21, 2003, 9:38 AM - */ - +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.test.util; import java.io.ByteArrayInputStream; import java.io.IOException; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/XMLUtilities.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/XMLUtilities.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/XMLUtilities.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.test.util; import java.io.BufferedWriter; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractPluginsLoadTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractPluginsLoadTest.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractPluginsLoadTest.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,12 +1,12 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.tests; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,13 +1,13 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.tests; import java.io.IOException; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractRuntimeTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractRuntimeTest.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractRuntimeTest.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.tests; import org.eclipse.core.runtime.IBundleGroup; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/IMarkerFilter.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/IMarkerFilter.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/IMarkerFilter.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. + * Copyright (c) 2009-2012 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/ImportProvider.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/ImportProvider.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/ImportProvider.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007-2012 Exadel, Inc. and Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/PreferencePageTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/PreferencePageTest.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/PreferencePageTest.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,12 +1,12 @@ -/******************************************************************************* - * Copyright (c) 2007 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.tests; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/TestSuiteWithParams.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/TestSuiteWithParams.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/TestSuiteWithParams.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,6 +1,13 @@ -/** +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html * - */ + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.tests; import java.beans.IntrospectionException; Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/TestsPlugin.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/TestsPlugin.java 2012-01-21 01:44:22 UTC (rev 38013) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/TestsPlugin.java 2012-01-21 01:54:22 UTC (rev 38014) @@ -1,6 +1,13 @@ -/** +/******************************************************************************* + * Copyright (c) 2007-2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html * - */ + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.tests; import org.eclipse.ui.plugin.AbstractUIPlugin;

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38013 - in trunk/jmx: plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/util and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2012-01-20 20:44:22 -0500 (Fri, 20 Jan 2012) New Revision: 38013 Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/DeleteConnectionJob.java trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/JMXException.java trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/util/EqualsUtil.java trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/EditorConnectionMapping.java trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/EmbedableLabelProvider.java trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/DefaultProviderTest.java trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/ErrorRootTest.java trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/ImpactTest.java trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/JMXCoreAllTests.java trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/JMXExceptionTest.java trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/JMXTestPlugin.java trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/MockConnectionWrapper.java trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/test/JMXUIAllTests.java Log: Copyright comment is added where it's missing Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/DeleteConnectionJob.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/DeleteConnectionJob.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/DeleteConnectionJob.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.core; import org.eclipse.core.runtime.IProgressMonitor; Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/JMXException.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/JMXException.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/JMXException.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.core; import org.eclipse.core.runtime.CoreException; Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/util/EqualsUtil.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/util/EqualsUtil.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/util/EqualsUtil.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.core.util; import javax.management.MBeanInfo; Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/EditorConnectionMapping.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/EditorConnectionMapping.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/editors/EditorConnectionMapping.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.ui.internal.editors; import java.util.ArrayList; Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/EmbedableLabelProvider.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/EmbedableLabelProvider.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/EmbedableLabelProvider.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.ui.internal.views.navigator; import org.eclipse.jface.viewers.LabelProvider; Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/DefaultProviderTest.java =================================================================== --- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/DefaultProviderTest.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/DefaultProviderTest.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.core.test; import java.util.ArrayList; Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/ErrorRootTest.java =================================================================== --- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/ErrorRootTest.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/ErrorRootTest.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.core.test; import junit.framework.TestCase; Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/ImpactTest.java =================================================================== --- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/ImpactTest.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/ImpactTest.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.core.test; import static org.junit.Assert.*; Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/JMXCoreAllTests.java =================================================================== --- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/JMXCoreAllTests.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/JMXCoreAllTests.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.core.test; import junit.framework.Test; Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/JMXExceptionTest.java =================================================================== --- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/JMXExceptionTest.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/JMXExceptionTest.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.core.test; import static org.junit.Assert.assertTrue; Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/JMXTestPlugin.java =================================================================== --- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/JMXTestPlugin.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/JMXTestPlugin.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.core.test; import org.eclipse.core.runtime.IStatus; Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/MockConnectionWrapper.java =================================================================== --- trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/MockConnectionWrapper.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/src/org/jboss/tools/jmx/core/test/MockConnectionWrapper.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.core.test; import java.io.IOException; Modified: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/test/JMXUIAllTests.java =================================================================== --- trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/test/JMXUIAllTests.java 2012-01-21 01:41:08 UTC (rev 38012) +++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test/src/org/jboss/tools/jmx/ui/test/JMXUIAllTests.java 2012-01-21 01:44:22 UTC (rev 38013) @@ -1,3 +1,13 @@ +/******************************************************************************* + * Copyright (c) 2006 Jeff Mesnil + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * "Rob Stryker" <rob.stryker(a)redhat.com> - Initial implementation + *******************************************************************************/ package org.jboss.tools.jmx.ui.test; import org.jboss.tools.jmx.ui.internal.test.MBeanUtilsTestCase; @@ -4,7 +14,6 @@ import junit.framework.Test; import junit.framework.TestSuite; - public class JMXUIAllTests { public static Test suite() { TestSuite suite = new TestSuite();

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38012 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-01-20 20:41:08 -0500 (Fri, 20 Jan 2012) New Revision: 38012 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java Log: JBIDE-10645 https://issues.joss.org/browse/JBIDE-10645 Supported JAX-RS in validation of servlet-mapping/servlet-name. Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java 2012-01-21 01:33:10 UTC (rev 38011) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckClass.java 2012-01-21 01:41:08 UTC (rev 38012) @@ -87,30 +87,41 @@ } if(type != null) { - String mustImpl = null; - try { mustImpl = checkImplements(object, type); } catch (Exception e) { + try { + check(object, value, type); + } catch (Exception e) { LogHelper.logError("org.jboss.tools.jst.web.verification", e); //$NON-NLS-1$ } - if(mustImpl != null) { - fireImplements(object, preference, value, mustImpl); - } - String mustExtend = null; - try { mustExtend = checkExtends(object, type); } catch (Exception e) { - LogHelper.logError("org.jboss.tools.jst.web.verification", e); //$NON-NLS-1$ - } - if(mustExtend != null) { - fireExtends(object, preference, value, mustExtend); - } return; } fireNotExist(object, preference, value); } + + protected void check(XModelObject object, String value, IType type) throws JavaModelException { + String mustImpl = checkImplements(object, type); + if(mustImpl != null) { + fireImplements(object, preference, value, mustImpl); + } + String mustExtend = checkExtends(object, type); + if(mustExtend != null) { + fireExtends(object, preference, value, mustExtend); + } + } private boolean checkQualifiedName(String value) { return constraint.accepts(value); } - - private String checkImplements(XModelObject object, IType type) throws Exception { + + /** + * Returns name of interface that should be implemented by type but is not. + * Returns null if no restriction on type is set. + * + * @param object + * @param type + * @return + * @throws JavaModelException + */ + protected String checkImplements(XModelObject object, IType type) throws JavaModelException { if("java.lang.Class".equals(type.getFullyQualifiedName())) return null; //$NON-NLS-1$ String impl = implementsType; if(impl == null || impl.length() == 0) return null; @@ -129,7 +140,16 @@ return checkImplements(object, type); } - private String checkExtends(XModelObject object, IType type) throws Exception { + /** + * Returns name of class that should be extended by type but is not. + * Returns null if no restriction on type is set or if type is interface. + * + * @param object + * @param type + * @return + * @throws JavaModelException + */ + protected String checkExtends(XModelObject object, IType type) throws JavaModelException { if(type.isInterface()) return null; if("java.lang.Class".equals(type.getFullyQualifiedName())) return null; //$NON-NLS-1$ String ext = extendsType; Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java 2012-01-21 01:33:10 UTC (rev 38011) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/validation/CheckServletMappingName.java 2012-01-21 01:41:08 UTC (rev 38012) @@ -10,15 +10,19 @@ ******************************************************************************/ package org.jboss.tools.jst.web.validation; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.model.*; import org.jboss.tools.common.validation.ValidationErrorManager; +import org.jboss.tools.jst.web.WebModelPlugin; import org.jboss.tools.jst.web.model.helpers.WebAppHelper; /** * @author Viacheslav Kabanovich */ public class CheckServletMappingName extends Check { + public static String JAX_RS_APPLICATION = "javax.ws.rs.core.Application"; //$NON-NLS-1$ static String ATTR = "servlet-name"; //$NON-NLS-1$ boolean acceptEmpty = false; @@ -34,7 +38,20 @@ if(acceptEmpty) return; fireMessage(object, NLS.bind(WebXMLValidatorMessages.EMPTY, attr)); } else if(findServlet(object, servletName) == null) { - fireMessage(object, NLS.bind(WebXMLValidatorMessages.SERVLET_NOT_EXISTS, attr, servletName)); + //JAX-RS + if(servletName.equals(JAX_RS_APPLICATION)) { + return; + } + IType type = CheckClass.getValidType(servletName, object); + if(type != null) { + try { + new CheckServletClass(manager).check(object, servletName, type); + } catch (JavaModelException e) { + WebModelPlugin.getDefault().logError(e); + } + } else { + fireMessage(object, NLS.bind(WebXMLValidatorMessages.SERVLET_NOT_EXISTS, attr, servletName)); + } } } @@ -48,3 +65,18 @@ } } + +class CheckServletClass extends CheckClass { + + public CheckServletClass(ValidationErrorManager manager) { + super(manager, WebXMLPreferences.INVALID_SERVLET_REF, CheckServletMappingName.ATTR, false, null, CheckServletMappingName.JAX_RS_APPLICATION); + } + + protected void check(XModelObject object, String value, IType type) throws JavaModelException { + String mustExtend = checkExtends(object, type); + if(mustExtend == null) { + return; + } + fireExtends(object, preference, value, mustExtend); + } +}

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38011 - trunk/requirements/seam-2.3.0.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-01-20 20:33:10 -0500 (Fri, 20 Jan 2012) New Revision: 38011 Modified: trunk/requirements/seam-2.3.0/build.properties trunk/requirements/seam-2.3.0/buildRequirement.xml Log: Added seam 2.3.0 requirement defenition Modified: trunk/requirements/seam-2.3.0/build.properties =================================================================== --- trunk/requirements/seam-2.3.0/build.properties 2012-01-21 00:15:50 UTC (rev 38010) +++ trunk/requirements/seam-2.3.0/build.properties 2012-01-21 01:33:10 UTC (rev 38011) @@ -3,5 +3,4 @@ seam-2.3.0.build.uri=${seam.build.uri} build.uri=${seam-2.3.0.build.uri} build.archive=jboss-seam-2.3.0.ALPHA-distribution.zip -build.archive.root=jboss-seam-2.3.0 md5=07b19de75bcb86b5f4cff3a15d7e2158 Modified: trunk/requirements/seam-2.3.0/buildRequirement.xml =================================================================== --- trunk/requirements/seam-2.3.0/buildRequirement.xml 2012-01-21 00:15:50 UTC (rev 38010) +++ trunk/requirements/seam-2.3.0/buildRequirement.xml 2012-01-21 01:33:10 UTC (rev 38011) @@ -1,3 +1,14 @@ <project default="build.requirement"> <import file="../seam-2.0.1.GA/buildRequirement.xml" /> -</project> \ No newline at end of file + <target name="unpack-zip" > + <unzip src="${driver.dest}/${build.archive}" dest="${unzip.dest}/jboss-seam-2.3.0"> + <patternset> + <include name="seam-gen/**" /> + <include name="seam" /> + <include name="lib/*.jar" /> + <include name="lib/test/*.jar" /> + <include name="bootstrap/**" /> + </patternset> + </unzip> + </target> +</project>

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38010 - in trunk/seam/plugins/org.jboss.tools.seam.xml: resources/help and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-01-20 19:15:50 -0500 (Fri, 20 Jan 2012) New Revision: 38010 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta Log: JBIDE-10678 https://issues.joss.org/browse/JBIDE-10678 Support of Seam 2.3 components XML . Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2012-01-21 00:15:27 UTC (rev 38009) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2012-01-21 00:15:50 UTC (rev 38010) @@ -131,9 +131,13 @@ <uri name="http://jboss.com/products/seam/async-2.2.xsd" - uri="schemas/async-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/async-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/async-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/async-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/bpm-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/bpm-2.0.xsd"/> @@ -143,9 +147,13 @@ <uri name="http://jboss.com/products/seam/bpm-2.2.xsd" - uri="schemas/bpm-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/bpm-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/bpm-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/bpm-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/components-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/components-2.0.xsd"/> @@ -155,17 +163,25 @@ <uri name="http://jboss.com/products/seam/components-2.2.xsd" - uri="schemas/components-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/components-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/components-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/components-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/cache-2.1.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/cache-2.1.xsd"/> <uri name="http://jboss.com/products/seam/cache-2.2.xsd" - uri="schemas/cache-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/cache-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/cache-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/cache-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/core-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/core-2.0.xsd"/> @@ -175,9 +191,13 @@ <uri name="http://jboss.com/products/seam/core-2.2.xsd" - uri="schemas/core-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/core-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/core-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/core-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/drools-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/drools-2.0.xsd"/> @@ -187,17 +207,25 @@ <uri name="http://jboss.com/products/seam/drools-2.2.xsd" - uri="schemas/drools-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/drools-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/drools-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/drools-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/document-2.1.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/document-2.1.xsd"/> <uri name="http://jboss.com/products/seam/document-2.2.xsd" - uri="schemas/document-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/document-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/document-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/document-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/framework-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/framework-2.0.xsd"/> @@ -207,9 +235,13 @@ <uri name="http://jboss.com/products/seam/framework-2.2.xsd" - uri="schemas/framework-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/framework-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/framework-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/framework-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/international-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/international-2.0.xsd"/> @@ -219,9 +251,13 @@ <uri name="http://jboss.com/products/seam/international-2.2.xsd" - uri="schemas/international-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/international-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/international-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/international-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/jms-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/jms-2.0.xsd"/> @@ -231,9 +267,13 @@ <uri name="http://jboss.com/products/seam/jms-2.2.xsd" - uri="schemas/jms-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/jms-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/jms-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/jms-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/mail-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/mail-2.0.xsd"/> @@ -243,9 +283,13 @@ <uri name="http://jboss.com/products/seam/mail-2.2.xsd" - uri="schemas/mail-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/mail-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/mail-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/mail-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/navigation-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/navigation-2.0.xsd"/> @@ -255,9 +299,13 @@ <uri name="http://jboss.com/products/seam/navigation-2.2.xsd" - uri="schemas/navigation-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/navigation-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/navigation-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/navigation-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/pageflow-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pageflow-2.0.xsd"/> @@ -267,9 +315,13 @@ <uri name="http://jboss.com/products/seam/pageflow-2.2.xsd" - uri="schemas/pageflow-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pageflow-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/pageflow-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pageflow-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/pages-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pages-2.0.xsd"/> @@ -282,6 +334,10 @@ uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pages-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/pages-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pages-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/pdf-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pdf-2.0.xsd"/> @@ -291,9 +347,13 @@ <uri name="http://jboss.com/products/seam/pdf-2.2.xsd" - uri="schemas/pdf-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pdf-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/pdf-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/pdf-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/persistence-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/persistence-2.0.xsd"/> @@ -303,9 +363,13 @@ <uri name="http://jboss.com/products/seam/persistence-2.2.xsd" - uri="schemas/persistence-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/persistence-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/persistence-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/persistence-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/remoting-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/remoting-2.0.xsd"/> @@ -315,9 +379,13 @@ <uri name="http://jboss.com/products/seam/remoting-2.2.xsd" - uri="schemas/remoting-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/remoting-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/remoting-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/remoting-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/security-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/security-2.0.xsd"/> @@ -327,9 +395,13 @@ <uri name="http://jboss.com/products/seam/security-2.2.xsd" - uri="schemas/security-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/security-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/security-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/security-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/spring-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/spring-2.0.xsd"/> @@ -359,13 +431,17 @@ <uri name="http://jboss.com/products/seam/theme-2.1.xsd" - uri="schemas/theme-2.1.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/theme-2.1.xsd"/> <uri name="http://jboss.com/products/seam/theme-2.2.xsd" - uri="schemas/theme-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/theme-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/theme-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/theme-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/transaction-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/transaction-2.0.xsd"/> @@ -375,9 +451,13 @@ <uri name="http://jboss.com/products/seam/transaction-2.2.xsd" - uri="schemas/transaction-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/transaction-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/transaction-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/transaction-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/web-2.0.xsd" uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/web-2.0.xsd"/> @@ -387,25 +467,37 @@ <uri name="http://jboss.com/products/seam/web-2.2.xsd" - uri="schemas/web-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/web-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/web-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/web-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/ui-2.1.xsd" - uri="schemas/ui-2.1.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/ui-2.1.xsd"/> <uri name="http://jboss.com/products/seam/ui-2.2.xsd" - uri="schemas/ui-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/ui-2.2.xsd"/> <uri + name="http://jboss.com/products/seam/ui-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/ui-2.3.xsd"/> + + <uri name="http://jboss.com/products/seam/wicket-2.1.xsd" - uri="schemas/wicket-2.1.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/wicket-2.1.xsd"/> <uri name="http://jboss.com/products/seam/wicket-2.2.xsd" - uri="schemas/wicket-2.2.xsd"/> + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/wicket-2.2.xsd"/> + <uri + name="http://jboss.com/products/seam/wicket-2.3.xsd" + uri="platform:/plugin/org.jboss.tools.seam.xml/schemas/wicket-2.3.xsd"/> + </catalogContribution> </extension> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties 2012-01-21 00:15:27 UTC (rev 38009) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties 2012-01-21 00:15:50 UTC (rev 38010) @@ -99,6 +99,8 @@ Seam.AddSession.menu=Session... Seam.AddIdentityFilter.menu=Identity Filter... Seam.AddWicketFilter.menu=Wicket Filter... +Seam.AddExceptionFilter.menu=Exception Filter... +Seam.AddCacheControlFilter.menu=Cache Control Filter... Seam.Wicket.menu=Wicket Seam.AddWebApplication.menu=Web Application... Seam.Rename=Rename1 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2012-01-21 00:15:27 UTC (rev 38009) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2012-01-21 00:15:50 UTC (rev 38010) @@ -1480,3 +1480,6 @@ FileSeamComponents22_AddWebApplication.WindowTitle=Add Web Application FileSeamComponents22_AddWebApplication.Title=Seam Wicket Web App + +Seam.AddCacheControlFilter.WindowTitle=Add Cache Control Filter +Seam.AddCacheControlFilter.Title=Seam Cache Control Filter Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta 2012-01-21 00:15:27 UTC (rev 38009) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-pdf.meta 2012-01-21 00:15:50 UTC (rev 38010) @@ -1,273 +1,264 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" - "meta.dtd"> -<XModelEntityGroup> - <VERSION DEPENDS="Model:1.0" MODULE="Seam" VERSION="1.0"/> - <MAPPINGS> - <MAPPING name="Handlers"/> - <MAPPING name="SeamNamespaces"> - <PAIR name="pdf" value="http://jboss.com/products/seam/pdf"/> - </MAPPING> - <MAPPING name="SeamSchemas"> - <PAIR name="pdf" value="http://jboss.com/products/seam/pdf-1.2.xsd"/> - <PAIR name="pdf$20" value="http://jboss.com/products/seam/pdf-2.0.xsd"/> - <PAIR name="pdf$21" value="http://jboss.com/products/seam/pdf-2.1.xsd"/> - <PAIR name="pdf$22" value="http://jboss.com/products/seam/pdf-2.2.xsd"/> - <PAIR name="pdf$23" value="http://jboss.com/products/seam/pdf-2.3.xsd"/> - </MAPPING> - </MAPPINGS> - <ICONS> - <GROUP name="action"> - <GROUP name="new"> - <GROUP name="drools"/> - </GROUP> - </GROUP> - <GROUP name="main"> - <GROUP name="seam"> - <GROUP name="pdf"> - <ICON name="store" path="images/struts/plug_in.gif"/> - </GROUP> - </GROUP> - </GROUP> - </ICONS> - <GlobalActions kind="list"/> - <XModelEntity ImplementingClass="%Custom%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" - XMLSUBPATH="pdf:document-store" name="SeamPdfDocumentStore"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="main.seam.pdf.store" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute default="document store" loader="ElementType" name="element type"> - <Editor name="Uneditable"/> - </XModelAttribute> - <XModelAttributeReference - attributes="name,class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> - <XModelAttribute PROPERTIES="category=general" name="error-page" xmlname="error-page"/> - <XModelAttribute PROPERTIES="category=general" name="use-extensions" xmlname="use-extensions"/> - <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Editor name="Note"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"> - <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/> - </XActionItem> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem displayName="move" kind="list" name="MoveActions"> - <XActionItem HIDE="always" HandlerClassName="%Move%" - ICON="action.move" displayName="Move" kind="action" name="Move"/> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XModelEntity ImplementingClass="%Custom%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" - XMLSUBPATH="pdf:key-store-config" name="SeamPdfKeyStoreConfig"> - <XChildrenEntities/> - <XEntityRenderer> - <ICONS> - <ICON info="main.seam.pdf.store" type="main"/> - </ICONS> - </XEntityRenderer> - <XModelAttributes> - <XModelAttribute default="key store config" loader="ElementType" name="element type"> - <Editor name="Uneditable"/> - </XModelAttribute> - <XModelAttributeReference - attributes="name,class,scope,precedence,installed,auto-create" - entity="SeamComponent" name="component"/> - <XModelAttribute PROPERTIES="category=general" name="key-store" xmlname="key-store"/> - <XModelAttribute PROPERTIES="category=general" - name="key-store-password" xmlname="key-store-password"/> - <XModelAttribute PROPERTIES="category=general" name="key-password" xmlname="key-password"/> - <XModelAttribute PROPERTIES="category=advanced" name="key-alias" xmlname="key-alias"/> - <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> - <Editor name="Note"/> - </XModelAttribute> - </XModelAttributes> - <XActionItem kind="list"> - <XActionItem kind="list" name="CreateActions"/> - <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"> - <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/> - </XActionItem> - <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> - <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" - ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> - <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" - ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> - </XActionItem> - <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> - <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" - ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> - </XActionItem> - <XActionItem ICON="action.empty" kind="list" name="Properties"> - <XActionItem HandlerClassName="%Properties%" ICON="action.empty" - displayName="Properties..." kind="action" name="Properties"/> - </XActionItem> - <XActionItem displayName="move" kind="list" name="MoveActions"> - <XActionItem HIDE="always" HandlerClassName="%Move%" - ICON="action.move" displayName="Move" kind="action" name="Move"/> - </XActionItem> - </XActionItem> - <XDependencies/> - </XModelEntity> - <XEntityExtension name="FileSeamComponents12"> - <XChildrenEntities> - <XChildEntity name="SeamPdfDocumentStore"/> - <XChildEntity name="SeamPdfKeyStoreConfig"/> - </XChildrenEntities> - <XActionItem kind="list"> - <XActionItem ICON="action.empty" displayName="New" group="1" - kind="list" name="CreateActions"> - <XActionItem ICON="action.empty" displayName="Pdf" group="1" - kind="list" name="Pdf"> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Document Store..." kind="action" name="AddDocumentStore"> - <EntityData EntityName="SeamPdfDocumentStore"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="error-page" Mandatory="no"/> - </EntityData> - </XActionItem> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Key Store Config..." kind="action" name="AddKeyStoreConfig"> - <EntityData EntityName="SeamPdfKeyStoreConfig"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="key-store" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - </XActionItem> - </XEntityExtension> - <XEntityExtension name="FileSeamComponents12_EditorActionList"> - <XChildrenEntities/> - <XActionItem kind="list"> - <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions"> - <XActionItem ICON="action.empty" displayName="Pdf" group="1" - kind="list" name="Pdf"> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Document Store..." kind="action" name="AddDocumentStore"> - <EntityData EntityName="SeamPdfDocumentStore"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="error-page" Mandatory="no"/> - </EntityData> - </XActionItem> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Key Store Config..." kind="action" name="AddKeyStoreConfig"> - <EntityData EntityName="SeamPdfKeyStoreConfig"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="key-store" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - </XActionItem> - </XEntityExtension> - <XEntityExtension name="FileSeamComponents20"> - <XChildrenEntities> - <XChildEntity name="SeamPdfDocumentStore"/> - <XChildEntity name="SeamPdfKeyStoreConfig"/> - </XChildrenEntities> - <XActionItem kind="list"> - <XActionItem ICON="action.empty" displayName="New" group="1" - kind="list" name="CreateActions"> - <XActionItem ICON="action.empty" displayName="Pdf" group="1" - kind="list" name="Pdf"> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Document Store..." kind="action" name="AddDocumentStore"> - <EntityData EntityName="SeamPdfDocumentStore"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="error-page" Mandatory="no"/> - </EntityData> - </XActionItem> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Key Store Config..." kind="action" name="AddKeyStoreConfig"> - <EntityData EntityName="SeamPdfKeyStoreConfig"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="key-store" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - </XActionItem> - </XEntityExtension> - <XEntityExtension name="FileSeamComponents21"> - <XChildrenEntities> - <XChildEntity name="SeamPdfDocumentStore"/> - <XChildEntity name="SeamPdfKeyStoreConfig"/> - </XChildrenEntities> - <XActionItem kind="list"> - <XActionItem ICON="action.empty" displayName="New" group="1" - kind="list" name="CreateActions"> - <XActionItem ICON="action.empty" displayName="Pdf" group="1" - kind="list" name="Pdf"> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Document Store..." kind="action" name="AddDocumentStore"> - <EntityData EntityName="SeamPdfDocumentStore"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="error-page" Mandatory="no"/> - </EntityData> - </XActionItem> - <XActionItem HandlerClassName="%Create%" ICON="action.empty" - PROPERTIES="validator.add=true" WizardClassName="%Default%" - displayName="Key Store Config..." kind="action" name="AddKeyStoreConfig"> - <EntityData EntityName="SeamPdfKeyStoreConfig"> - <AttributeData AttributeName="name"/> - <AttributeData AttributeName="key-store" Mandatory="no"/> - </EntityData> - </XActionItem> - </XActionItem> - </XActionItem> - </XActionItem> - </XEntityExtension> - <XEntityExtension name="FileSeamComponents22"> - <XChildrenEntities> - <XChildEntity name="SeamPdfDocumentStore"/> - <XChildEntity name="SeamPdfKeyStoreConfig"/> - </XChildrenEntities> - <XActionItem kind="list"> - <XActionItem ICON="action.empty" displayName="New" group="1" - kind="list" name="CreateActions"> - <XActionItemReference entity="FileSeamComponents21" name="Pdf" path="CreateActions.Pdf"/> - </XActionItem> - </XActionItem> - </XEntityExtension> - <XEntityExtension name="FileSeamComponents23"> - <XChildrenEntities> - <XChildEntity name="SeamPdfDocumentStore"/> - <XChildEntity name="SeamPdfKeyStoreConfig"/> - </XChildrenEntities> - <XActionItem kind="list"> - <XActionItem ICON="action.empty" displayName="New" group="1" - kind="list" name="CreateActions"> - <XActionItemReference entity="FileSeamComponents21" name="Pdf" path="CreateActions.Pdf"/> - </XActionItem> - </XActionItem> - </XEntityExtension> -</XModelEntityGroup> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN" + "meta.dtd"> +<XModelEntityGroup> + <VERSION DEPENDS="Model:1.0" MODULE="Seam" VERSION="1.0"/> + <MAPPINGS> + <MAPPING name="Handlers"/> + <MAPPING name="SeamNamespaces"> + <PAIR name="pdf" value="http://jboss.com/products/seam/pdf"/> + </MAPPING> + <MAPPING name="SeamSchemas"> + <PAIR name="pdf" value="http://jboss.com/products/seam/pdf-1.2.xsd"/> + <PAIR name="pdf$20" value="http://jboss.com/products/seam/pdf-2.0.xsd"/> + <PAIR name="pdf$21" value="http://jboss.com/products/seam/pdf-2.1.xsd"/> + <PAIR name="pdf$22" value="http://jboss.com/products/seam/pdf-2.2.xsd"/> + <PAIR name="pdf$23" value="http://jboss.com/products/seam/pdf-2.3.xsd"/> + </MAPPING> + </MAPPINGS> + <ICONS> + <GROUP name="action"> + <GROUP name="new"> + <GROUP name="drools"/> + </GROUP> + </GROUP> + <GROUP name="main"> + <GROUP name="seam"> + <GROUP name="pdf"> + <ICON name="store" path="images/struts/plug_in.gif"/> + </GROUP> + </GROUP> + </GROUP> + </ICONS> + <GlobalActions kind="list"/> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="pdf:document-store" name="SeamPdfDocumentStore"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.pdf.store" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="document store" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttributeReference + attributes="name,class,scope,precedence,installed,auto-create" + entity="SeamComponent" name="component"/> + <XModelAttribute PROPERTIES="category=general" name="error-page" xmlname="error-page"/> + <XModelAttribute PROPERTIES="category=general" name="use-extensions" xmlname="use-extensions"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"> + <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="pdf:key-store-config" name="SeamPdfKeyStoreConfig"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.pdf.store" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="key store config" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.pdf.pdfKeyStore" name="name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create" + entity="SeamComponent" name="component"/> + <XModelAttribute PROPERTIES="category=general" name="key-store" xmlname="key-store"/> + <XModelAttribute PROPERTIES="category=general" + name="key-store-password" xmlname="key-store-password"/> + <XModelAttribute PROPERTIES="category=general" name="key-password" xmlname="key-password"/> + <XModelAttribute PROPERTIES="category=advanced" name="key-alias" xmlname="key-alias"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem kind="list" name="CreateActions"/> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"> + <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/> + </XActionItem> + <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions"> + <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%" + ICON="action.copy" displayName="Copy" kind="action" name="Copy"/> + <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%" + ICON="action.cut" displayName="Cut" kind="action" name="Cut"/> + </XActionItem> + <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions"> + <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%" + ICON="action.delete" displayName="Delete" kind="action" name="Delete"/> + </XActionItem> + <XActionItem ICON="action.empty" kind="list" name="Properties"> + <XActionItem HandlerClassName="%Properties%" ICON="action.empty" + displayName="Properties..." kind="action" name="Properties"/> + </XActionItem> + <XActionItem displayName="move" kind="list" name="MoveActions"> + <XActionItem HIDE="always" HandlerClassName="%Move%" + ICON="action.move" displayName="Move" kind="action" name="Move"/> + </XActionItem> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XEntityExtension name="FileSeamComponents12"> + <XChildrenEntities> + <XChildEntity name="SeamPdfDocumentStore"/> + <XChildEntity name="SeamPdfKeyStoreConfig"/> + </XChildrenEntities> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem ICON="action.empty" displayName="Pdf" group="1" + kind="list" name="Pdf"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Document Store..." kind="action" name="AddDocumentStore"> + <EntityData EntityName="SeamPdfDocumentStore"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="error-page" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Key Store Config..." kind="action" name="AddKeyStoreConfig"> + <EntityData EntityName="SeamPdfKeyStoreConfig"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="key-store" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> + <XEntityExtension name="FileSeamComponents12_EditorActionList"> + <XChildrenEntities/> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" kind="list" name="CreateActions"> + <XActionItem ICON="action.empty" displayName="Pdf" group="1" + kind="list" name="Pdf"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Document Store..." kind="action" name="AddDocumentStore"> + <EntityData EntityName="SeamPdfDocumentStore"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="error-page" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Key Store Config..." kind="action" name="AddKeyStoreConfig"> + <EntityData EntityName="SeamPdfKeyStoreConfig"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="key-store" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> + <XEntityExtension name="FileSeamComponents20"> + <XChildrenEntities> + <XChildEntity name="SeamPdfDocumentStore"/> + <XChildEntity name="SeamPdfKeyStoreConfig"/> + </XChildrenEntities> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem ICON="action.empty" displayName="Pdf" group="1" + kind="list" name="Pdf"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Document Store..." kind="action" name="AddDocumentStore"> + <EntityData EntityName="SeamPdfDocumentStore"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="error-page" Mandatory="no"/> + </EntityData> + </XActionItem> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Key Store Config..." kind="action" name="AddKeyStoreConfig"> + <EntityData EntityName="SeamPdfKeyStoreConfig"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="key-store" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> + <XEntityExtension name="FileSeamComponents21"> + <XChildrenEntities> + <XChildEntity name="SeamPdfKeyStoreConfig"/> + </XChildrenEntities> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItem ICON="action.empty" displayName="Pdf" group="1" + kind="list" name="Pdf"> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Key Store Config..." kind="action" name="AddKeyStoreConfig"> + <EntityData EntityName="SeamPdfKeyStoreConfig"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="key-store" Mandatory="no"/> + </EntityData> + </XActionItem> + </XActionItem> + </XActionItem> + </XActionItem> + </XEntityExtension> + <XEntityExtension name="FileSeamComponents22"> + <XChildrenEntities> + <XChildEntity name="SeamPdfKeyStoreConfig"/> + </XChildrenEntities> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItemReference entity="FileSeamComponents21" name="Pdf" path="CreateActions.Pdf"/> + </XActionItem> + </XActionItem> + </XEntityExtension> + <XEntityExtension name="FileSeamComponents23"> + <XChildrenEntities> + <XChildEntity name="SeamPdfKeyStoreConfig"/> + </XChildrenEntities> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="New" group="1" + kind="list" name="CreateActions"> + <XActionItemReference entity="FileSeamComponents21" name="Pdf" path="CreateActions.Pdf"/> + </XActionItem> + </XActionItem> + </XEntityExtension> +</XModelEntityGroup> Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2012-01-21 00:15:27 UTC (rev 38009) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-web.meta 2012-01-21 00:15:50 UTC (rev 38010) @@ -135,6 +135,46 @@ </XModelEntity> <XModelEntity ImplementingClass="%Custom%" PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" + XMLSUBPATH="web:cache-control-filter" name="SeamWebCacheControlFilter23"> + <XChildrenEntities/> + <XEntityRenderer> + <ICONS> + <ICON info="main.seam.web.filter" type="main"/> + </ICONS> + </XEntityRenderer> + <XModelAttributes> + <XModelAttribute default="cache control filter" loader="ElementType" name="element type"> + <Editor name="Uneditable"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.web.cacheControlFilter" name="name" xmlname="name"/> + <XModelAttributeReference + attributes="class,scope,precedence,installed,auto-create,startup" + entity="SeamComponent20" name="component"/> + <XModelAttributeReference + attributes="url-pattern,disabled,regex-url-pattern" + entity="SeamWebContextFilter20" name="filter"/> + <XModelAttribute PROPERTIES="category=advanced" name="value" xmlname="value"/> + <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> + <Editor name="Note"/> + </XModelAttribute> + </XModelAttributes> + <XActionItem kind="list"> + <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"> + <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/> + </XActionItem> + <XActionItemReference entity="SeamWebContextFilter" + name="CopyActions" path="CopyActions"/> + <XActionItemReference entity="SeamWebContextFilter" + name="DeleteActions" path="DeleteActions"/> + <XActionItemReference entity="SeamWebContextFilter" name="Properties" path="Properties"/> + <XActionItemReference entity="SeamWebContextFilter" + name="MoveActions" path="MoveActions"/> + </XActionItem> + <XDependencies/> + </XModelEntity> + <XModelEntity ImplementingClass="%Custom%" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData" XMLSUBPATH="web:character-encoding-filter" name="SeamWebCharacterFilter20"> <XChildrenEntities/> <XEntityRenderer> @@ -245,7 +285,7 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.servlet.contextFilter" name="name" xmlname="name"/> + default="org.jboss.seam.web.contextFilter" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create" entity="SeamComponent" name="component"/> @@ -329,7 +369,7 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.servlet.exceptionFilter" name="name" xmlname="name"/> + default="org.jboss.seam.web.exceptionFilter" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create,startup" entity="SeamComponent20" name="component"/> @@ -535,7 +575,7 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.servlet.multipartFilter" name="name" xmlname="name"/> + default="org.jboss.seam.web.multipartFilter" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create,startup" entity="SeamComponent20" name="component"/> @@ -624,7 +664,7 @@ <Editor name="Uneditable"/> </XModelAttribute> <XModelAttribute PROPERTIES="id=true;category=general" - default="org.jboss.seam.servlet.redirectFilter" name="name" xmlname="name"/> + default="org.jboss.seam.web.redirectFilter" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create,startup" entity="SeamComponent20" name="component"/> @@ -743,7 +783,8 @@ <XModelAttribute default="session" loader="ElementType" name="element type"> <Editor name="Uneditable"/> </XModelAttribute> - <XModelAttribute PROPERTIES="id=true;category=general" name="name" xmlname="name"/> + <XModelAttribute PROPERTIES="id=true;category=general" + default="org.jboss.seam.web.session" name="name" xmlname="name"/> <XModelAttributeReference attributes="class,scope,precedence,installed,auto-create,startup,startupDepends" entity="SeamComponent21" name="component"/> @@ -1181,12 +1222,13 @@ <XChildEntity name="SeamWebWicketFilter21"/> <XChildEntity name="SeamWebHotDeployFilter21"/> <XChildEntity name="SeamWebRewriteFilter21"/> + <XChildEntity name="SeamWebCacheControlFilter23"/> </XChildrenEntities> <XActionItem kind="list"> <XActionItem ICON="action.empty" displayName="New" group="1" kind="list" name="CreateActions"> <XActionItem ICON="action.empty" displayName="Web" group="1" - kind="list" name="Web"> + kind="list" name="Web"> <XActionItemReference entity="FileSeamComponents21" name="AddContextFilter"/> <XActionItemReference entity="FileSeamComponents21" name="AddExceptionFilter"/> <XActionItemReference entity="FileSeamComponents21" name="AddMultipartFilter"/> @@ -1200,6 +1242,14 @@ <XActionItemReference entity="FileSeamComponents21" name="AddWicketFilter"/> <XActionItemReference entity="FileSeamComponents21" name="AddHotDeployFilter"/> <XActionItemReference entity="FileSeamComponents21" name="AddRewriteFilter"/> + <XActionItem HandlerClassName="%Create%" ICON="action.empty" + PROPERTIES="validator.add=true" WizardClassName="%Default%" + displayName="Cache Control Filter..." kind="action" name="AddCacheControlFilter"> + <EntityData EntityName="SeamWebCacheControlFilter23"> + <AttributeData AttributeName="name"/> + <AttributeData AttributeName="value" Mandatory="no"/> + </EntityData> + </XActionItem> </XActionItem> </XActionItem> </XActionItem>

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38009 - in trunk/seam/tests/org.jboss.tools.seam.xml.test: src/org/jboss/tools/seam/xml/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2012-01-20 19:15:27 -0500 (Fri, 20 Jan 2012) New Revision: 38009 Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components23.xml Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java Log: JBIDE-10678 https://issues.joss.org/browse/JBIDE-10678 Support of Seam 2.3 components XML . Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components23.xml =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components23.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components23.xml 2012-01-21 00:15:27 UTC (rev 38009) @@ -0,0 +1,90 @@ +<?xml version="1.0"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:async="http://jboss.com/products/seam/async" + xmlns:bpm="http://jboss.com/products/seam/bpm" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:drools="http://jboss.com/products/seam/drools" + xmlns:framework="http://jboss.com/products/seam/framework" + xmlns:international="http://jboss.com/products/seam/international" + xmlns:jms="http://jboss.com/products/seam/jms" + xmlns:navigation="http://jboss.com/products/seam/navigation" + xmlns:pdf="http://jboss.com/products/seam/pdf" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:remoting="http://jboss.com/products/seam/remoting" + xmlns:security="http://jboss.com/products/seam/security" + xmlns:theme="http://jboss.com/products/seam/theme" + xmlns:transaction="http://jboss.com/products/seam/transaction" + xmlns:ui="http://jboss.com/products/seam/ui" + xmlns:web="http://jboss.com/products/seam/web" + xmlns:wicket="http://jboss.com/products/seam/wicket" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd http://jboss.com/products/seam/navigation http://jboss.com/products/seam/navigation-2.3.xsd http://jboss.com/products/seam/remoting http://jboss.com/products/seam/remoting-2.3.xsd http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.3.xsd http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.3.xsd http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.3.xsd http://jboss.com/products/seam/ui http://jboss.com/products/seam/ui-2.3.xsd http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.3.xsd http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.3.xsd http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.3.xsd http://jboss.com/products/seam/drools h! ttp://jboss.com/products/seam/drools-2.3.xsd http://jboss.com/products/seam/international http://jboss.com/products/seam/international-2.3.xsd http://jboss.com/products/seam/wicket http://jboss.com/products/seam/wicket-2.3.xsd http://jboss.com/products/seam/pdf http://jboss.com/products/seam/pdf-2.3.xsd http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd http://jboss.com/products/seam/theme http://jboss.com/products/seam/theme-2.3.xsd http://jboss.com/products/seam/jms http://jboss.com/products/seam/jms-2.3.xsd http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.3.xsd"> + <component class="org.MyClass" name="myComponent"/> + <factory name="myFactory" value="myFactory"/> + <event type="myType"/> + <import>org.mypackage</import> + <navigation:pages http-port="3" https-port="4" login-view-id="2" no-conversation-view-id="1"/> + <remoting:remoting debug="false" poll-interval="1" poll-timeout="2"/> + <framework:entity-query ejbql="abc" name="entityQuery"/> + <framework:hibernate-entity-query ejbql="abc" name="hibernateEntityQuery"/> + <framework:entity-home entity-class="org.MyEntityHome" name="entityHome"/> + <framework:hibernate-entity-home name="hibernateEntityHome"/> + <security:identity authenticate-method="#{m1}" remember-me="true"/> + <security:identity-manager identity-store="#{xyz}"/> + <security:jpa-identity-store entity-manager="myManager" user-class="org.MyStore"/> + <security:jpa-token-store entity-manager="myEntityManager" token-class="String"/> + <security:ldap-identity-store server-address="777" server-port="555"/> + <security:permission-manager permission-store="#{permissionStore}"/> + <security:jpa-permission-store entity-manager="myEntityManager" user-permission-class="org.MyPermissionClass"/> + <security:rule-based-permission-resolver security-rules="#{myRules}"/> + <security:persistent-permission-resolver permission-store="#{myPermissionStore}"/> + <security:remember-me cookie-max-age="101" mode="disabled"/> + <transaction:ejb-transaction jndi-name="abc"/> + <ui:jpa-entity-loader entity-manager="myEntityManager"/> + <ui:hibernate-entity-loader session="mySession"/> + <ui:entity-converter entity-loader="myEntityLoader"/> + <web:context-filter url-pattern="*"/> + <web:exception-filter url-pattern="*"/> + <web:multipart-filter url-pattern="*"/> + <web:ajax4jsf-filter/> + <web:authentication-filter/> + <web:cache-control-filter/> + <web:character-encoding-filter/> + <web:hot-deploy-filter/> + <web:identity-filter/> + <web:logging-filter/> + <web:redirect-filter/> + <web:rewrite-filter/> + <web:session/> + <web:wicket-filter application-class="myClass" + application-factory-class="myFactoryClass" detect-portlet-context="true"/> + <persistence:managed-persistence-context name="myPersistentContext" persistence-unit-jndi-name="myname"/> + <persistence:entity-manager-factory name="myManagerFactory" persistence-unit-name="myName"/> + <persistence:filter name="myFilter"> + <persistence:name>myFilterName</persistence:name> + </persistence:filter> + <persistence:managed-hibernate-session name="mySession" + session-factory="mySessionFactory" session-factory-jndi-name="myName"/> + <persistence:hibernate-session-factory cfg-resource-name="rname" name="mySessionFactory"> + <persistence:naming-strategy>#{mystrategy}</persistence:naming-strategy> + </persistence:hibernate-session-factory> + <async:timer-service-dispatcher scope="stateless"/> + <drools:managed-working-memory name="myManagedWorkingMemory" rule-base="#{bb}"/> + <drools:rule-base name="myRuleBase" rule-files="fff"/> + <drools:rule-agent configuration-file="fff" name="myRuleAgent"/> + <international:locale-selector locale-string="ss"/> + <international:time-zone-selector time-zone-id="22"/> + <international:locale-config default-locale="ru"/> + <wicket:web-application application-class="org.MyApplication"/> + <pdf:key-store-config key-store="keyStore" name="myKeyStore" key-alias="a" key-password="p" key-store-password="q"/> + <core:init jndi-pattern="pp" transaction-management-enabled="true" security-enabled="true" debug="true"/> + <core:manager conversation-timeout="1" concurrent-request-timeout="1" conversation-id-parameter="p" default-flush-mode="MANUAL" parent-conversation-id-parameter="q"/> + <core:pojo-cache cfg-resource-name="nnn"/> + <core:resource-loader bundle-names="n1,n2"/> + <theme:theme-selector name="mySelector" theme="x" available-themes="x,y" cookie-enabled="true" cookie-max-age="100"/> + <jms:queue-connection queue-connection-factory-jndi-name="myName"/> + <jms:topic-connection topic-connection-factory-jndi-name="factory"/> + <jms:managed-topic-publisher name="myTopicPublisher" topic-jndi-name="jjj"/> + <jms:managed-queue-sender name="mySender" queue-jndi-name="nn"/> + <bpm:actor group-actor-ids="1"/> + <bpm:jbpm/> +</components> Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components23.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java 2012-01-20 23:55:08 UTC (rev 38008) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java 2012-01-21 00:15:27 UTC (rev 38009) @@ -66,6 +66,12 @@ return EclipseResourceUtil.createObjectForResource(f); } + protected XModelObject getComponents23Object() { + IFile f = project.getFile(new Path("components23.xml")); + assertTrue(f.exists()); + return EclipseResourceUtil.createObjectForResource(f); + } + public void testNavigationPagesComponent() { XModelObject fileObject = getComponents22Object(); assertNotNull("Cannot create XModel object for file components22.xml.", fileObject); @@ -90,7 +96,7 @@ JobUtils.waitForIdle(); XMarkerManager.getInstance(); assertNotNull("Cannot create XModel object for file components22.xml.", fileObject); - + XModelObject coreInit0 = fileObject.getChildByPath("org.jboss.seam.core.init"); assertNotNull("Cannot find component org.jboss.seam.core.init.", coreInit0); assertFalse("Validator found wrong errors in component org.jboss.seam.core.init", XMarkerManager.getInstance().hasErrors(coreInit0)); @@ -105,6 +111,19 @@ } + public void testXML23Model() { + IFile f = project.getFile(new Path("components23.xml")); + assertTrue("File components23.xml is not accessible in Test project.", f.isAccessible()); + + XModelObject fileObject = EclipseResourceUtil.createObjectForResource(f); + assertNotNull("Cannot create XModel object for file components22.xml.", fileObject); + + String entity = fileObject.getModelEntity().getName(); + assertEquals("File components23.xml is incorrectly parsed by XModel.", SeamComponentConstants.ENT_SEAM_COMPONENTS_23, entity); + + //TODO continue test + } + protected void assertAttribute(XModelObject object, String name, String value) { String actual = object.getAttributeValue(name); assertEquals("Attribute " + name + " in " + object.getPresentationString() + " is incorrect.", value, actual);

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38008 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-01-20 18:55:08 -0500 (Fri, 20 Jan 2012) New Revision: 38008 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java Log: https://issues.jboss.org/browse/JBIDE-10679 Seam facet version 2.3 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java 2012-01-20 22:18:46 UTC (rev 38007) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java 2012-01-20 23:55:08 UTC (rev 38008) @@ -116,7 +116,7 @@ * then the default one will be returned. */ public SeamRuntime getLatestSeamRuntime() { - SeamVersion latestVersion = runtimes.isEmpty()?SeamVersion.getLatestDefaultVersion():SeamVersion.SEAM_2_0; + SeamVersion latestVersion = runtimes.isEmpty()?SeamVersion.getLatestDefaultVersion():SeamVersion.SEAM_1_2; for (SeamRuntime runtime : runtimes.values()) { if(runtime.getVersion().compareTo(latestVersion)>=0) { latestVersion = runtime.getVersion();

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38007 - in trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui: commands and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2012-01-20 17:18:46 -0500 (Fri, 20 Jan 2012) New Revision: 38007 Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/document/ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/document/ForgeDocument.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/document/ForgeDocumentPartitioner.java Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/ForgeCommandListHandler.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandFilter.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/NewProjectPostProcessor.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/SelectionSynchronizer.java Log: JBIDE-10000: Decouple Forge Runtime and Forge Console Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/ForgeCommandListHandler.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/ForgeCommandListHandler.java 2012-01-20 21:26:21 UTC (rev 38006) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/commands/ForgeCommandListHandler.java 2012-01-20 22:18:46 UTC (rev 38007) @@ -9,6 +9,7 @@ import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; import org.eclipse.ui.handlers.HandlerUtil; +import org.jboss.tools.forge.core.preferences.ForgeRuntimesPreferences; import org.jboss.tools.forge.core.process.ForgeRuntime; import org.jboss.tools.forge.ui.ForgeUIPlugin; import org.jboss.tools.forge.ui.dialog.ForgeCommandListDialog; @@ -21,7 +22,7 @@ if (window == null) { return null; } - ForgeRuntime runtime = getForgeRuntime(window); + ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault(); if (isStarting(runtime)) { showWaitUntilStartedMessage(); } else if (!(isRunning(runtime))) { @@ -41,20 +42,6 @@ return runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState()); } - private ForgeRuntime getForgeRuntime(IWorkbenchWindow window) { - try { - IViewPart part = window.getActivePage().showView(ForgeView.ID); - if (part != null && part instanceof ForgeView) { - return ((ForgeView)part).getRuntime(); - } else { - return null; - } - } catch (PartInitException e) { - ForgeUIPlugin.log(e); - return null; - } - } - private void showWaitUntilStartedMessage() { MessageDialog.openInformation(null, "Forge Starting", "Forge is starting. Please wait until the Forge runtime is started"); } Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandFilter.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandFilter.java 2012-01-20 21:26:21 UTC (rev 38006) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandFilter.java 2012-01-20 22:18:46 UTC (rev 38007) @@ -26,5 +26,5 @@ } } } - + } Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2012-01-20 21:26:21 UTC (rev 38006) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeTextViewer.java 2012-01-20 22:18:46 UTC (rev 38007) @@ -1,11 +1,6 @@ package org.jboss.tools.forge.ui.console; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.Document; import org.eclipse.jface.text.DocumentEvent; import org.eclipse.jface.text.IDocumentListener; import org.eclipse.jface.text.TextViewer; @@ -15,13 +10,10 @@ import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.custom.VerifyKeyListener; import org.eclipse.swt.events.VerifyEvent; -import org.eclipse.swt.graphics.Color; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.jboss.tools.forge.core.io.ForgeAnsiCommandFilter; -import org.jboss.tools.forge.core.io.ForgeOutputListener; +import org.jboss.tools.forge.core.preferences.ForgeRuntimesPreferences; import org.jboss.tools.forge.core.process.ForgeRuntime; -import org.jboss.tools.forge.ui.ForgeUIPlugin; +import org.jboss.tools.forge.ui.document.ForgeDocument; public class ForgeTextViewer extends TextViewer { @@ -34,98 +26,94 @@ private static String NEXT_HISTORY = new Character((char)14).toString(); private static String DELETE_NEXT_CHAR = new Character((char)127).toString(); - private class RuntimeStopListener implements PropertyChangeListener { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (ForgeRuntime.PROPERTY_STATE.equals(evt.getPropertyName()) && - ForgeRuntime.STATE_NOT_RUNNING.equals(evt.getNewValue())) { - handleRuntimeStopped(); - } - } - } - - private class DocumentListener implements IDocumentListener { + private class DocumentListener implements IDocumentListener, ForgeDocument.CursorListener { @Override public void documentAboutToBeChanged(DocumentEvent event) { } @Override public void documentChanged(final DocumentEvent event) { - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - StyledText textWidget = getTextWidget(); - if (textWidget != null && !textWidget.isDisposed()) { - int lineCount = textWidget.getLineCount(); - textWidget.setTopIndex(lineCount - 1); - } - } - }); + StyledText textWidget = getTextWidget(); + if (textWidget != null && !textWidget.isDisposed()) { + int lineCount = textWidget.getLineCount(); + textWidget.setTopIndex(lineCount - 1); + StyleRange styleRange = ForgeDocument.INSTANCE.getCurrentStyleRange(); + if (styleRange != null) { + textWidget.setStyleRange(styleRange); + } + } } + @Override + public void cursorMoved() { + StyledText textWidget = getTextWidget(); + if (textWidget != null && !textWidget.isDisposed()) { + textWidget.setCaretOffset(ForgeDocument.INSTANCE.getCursorOffset()); + } + } } - private RuntimeStopListener stopListener; - private ForgeOutputListener outputListener; - private ForgeRuntime runtime; - private Document document; - private StyleRange currentStyleRange = null; - private int caretOffset = 0; +// private ForgeRuntime runtime; + private DocumentListener documentListener = new DocumentListener(); - public ForgeTextViewer(Composite parent, ForgeRuntime runtime) { + public ForgeTextViewer(Composite parent) { super(parent, SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL); - this.runtime = runtime; initialize(); } private void initialize() { initDocument(); initViewer(); - initOutputListener(); - initStopListener(); } private void initDocument() { - document = new Document(); - document.addDocumentListener(new DocumentListener()); - setDocument(document); + ForgeDocument.INSTANCE.addDocumentListener(documentListener); + ForgeDocument.INSTANCE.addCursorListener(documentListener); + setDocument(ForgeDocument.INSTANCE); } private void initViewer() { + getTextWidget().setStyleRanges(ForgeDocument.INSTANCE.getStyleRanges()); getTextWidget().setFont(JFaceResources.getFont(JFaceResources.TEXT_FONT)); getTextWidget().addVerifyKeyListener(new VerifyKeyListener() { @Override public void verifyKey(VerifyEvent event) { if ((event.stateMask & SWT.CTRL) == SWT.CTRL ) { if (event.keyCode == 'd') { - runtime.sendInput(CTRL_D); + getRuntime().sendInput(CTRL_D); } else if (event.keyCode == 'c') { - runtime.sendInput(CTRL_C); + getRuntime().sendInput(CTRL_C); } } } }); } + protected void handleDispose() { + ForgeDocument.INSTANCE.removeCursorListener(documentListener); + ForgeDocument.INSTANCE.removeDocumentListener(documentListener); + super.handleDispose(); + } + protected StyledText createTextWidget(Composite parent, int styles) { StyledText styledText= new StyledText(parent, styles) { public void invokeAction(int action) { switch (action) { case ST.LINE_UP: - runtime.sendInput(PREV_HISTORY); + getRuntime().sendInput(PREV_HISTORY); break; case ST.LINE_DOWN: - runtime.sendInput(NEXT_HISTORY); + getRuntime().sendInput(NEXT_HISTORY); break; case ST.COLUMN_PREVIOUS: - runtime.sendInput(PREV_CHAR); + getRuntime().sendInput(PREV_CHAR); break; case ST.COLUMN_NEXT: - runtime.sendInput(NEXT_CHAR); + getRuntime().sendInput(NEXT_CHAR); break; case ST.DELETE_PREVIOUS: - runtime.sendInput(DELETE_PREV_CHAR); + getRuntime().sendInput(DELETE_PREV_CHAR); break; case ST.DELETE_NEXT: - runtime.sendInput(DELETE_NEXT_CHAR); + getRuntime().sendInput(DELETE_NEXT_CHAR); break; default: super.invokeAction(action); } @@ -135,143 +123,13 @@ return styledText; } - private Color getColor(int colorCode) { - return Display.getDefault().getSystemColor(colorCode); - } - - private void initOutputListener() { - ForgeOutputListener target = new ForgeOutputListener() { - @Override - public void outputAvailable(final String output) { - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - try { - String filteredOutput = output.replaceAll("\r", ""); - document.replace(caretOffset, document.getLength() - caretOffset, filteredOutput); - getTextWidget().setCaretOffset(caretOffset = caretOffset + filteredOutput.length()); - if (currentStyleRange != null) { - currentStyleRange.length = currentStyleRange.length + filteredOutput.length(); - getTextWidget().setStyleRange(currentStyleRange); - } - } catch (BadLocationException e) { - ForgeUIPlugin.log(e); - } - } - }); - } - }; - ForgeAnsiCommandFilter ansiCommandFilter = new ForgeAnsiCommandFilter(target) { - @Override - public void ansiCommandAvailable(String command) { - executeAnsiCommand(command); - } - }; - outputListener = new ForgeCommandFilter(ansiCommandFilter); - runtime.addOutputListener(outputListener); - } - - private void initStopListener() { - stopListener = new RuntimeStopListener(); - runtime.addPropertyChangeListener(stopListener); - } - - private void handleRuntimeStopped() { - runtime.removePropertyChangeListener(stopListener); - stopListener = null; - runtime.removeOutputListener(outputListener); - outputListener = null; - } - protected void handleVerifyEvent(VerifyEvent e) { - runtime.sendInput(e.text); + getRuntime().sendInput(e.text); e.doit = false; } - private void executeAnsiCommand(final String command) { - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - char c = command.charAt(command.length() - 1); - switch (c) { - case 'G' : moveCursorAbsoluteInLine(command); break; - case 'K' : clearCurrentLine(command); break; - case 'm' : changeColor(command); break; - case 'H' : setCursorPosition(command); break; - case 'J' : clearCurrentScreenPage(command); break; - default : ForgeUIPlugin.log(new RuntimeException("Unhandled Ansi control sequence in ForgeTextViewer: "+ command)); - } - } - }); + private ForgeRuntime getRuntime() { + return ForgeRuntimesPreferences.INSTANCE.getDefault(); } - private void moveCursorAbsoluteInLine(final String command) { - try { - int column = Integer.valueOf(command.substring(2, command.length() - 1)); - int lineStart = document.getLineOffset(document.getLineOfOffset(caretOffset)); - getTextWidget().setCaretOffset(caretOffset = lineStart + column - 1); - } catch (BadLocationException e) { - ForgeUIPlugin.log(e); - } - } - - private void clearCurrentLine(String command) { - try { - document.replace(caretOffset, document.getLength() - caretOffset, ""); - } catch (BadLocationException e) { - ForgeUIPlugin.log(e); - } - } - - private void changeColor(String command) { - String str = command.substring(2, command.length() - 1); - Color newColor = null; - if ("30".equals(str)) { - newColor = getColor(SWT.COLOR_BLACK); - } else if ("31".equals(str)) { - newColor = getColor(SWT.COLOR_RED); - } else if ("32".equals(str)) { - newColor = getColor(SWT.COLOR_GREEN); - } else if ("33".equals(str)) { - newColor = getColor(SWT.COLOR_DARK_YELLOW); - } else if ("34".equals(str)) { - newColor = getColor(SWT.COLOR_BLUE); - } else if ("35".equals(str)) { - newColor = getColor(SWT.COLOR_MAGENTA); - } else if ("36".equals(str)) { - newColor = getColor(SWT.COLOR_CYAN); - } else if ("37".equals(str)) { - newColor = getColor(SWT.COLOR_GRAY); - } - if (newColor != null) { - currentStyleRange = new StyleRange(getTextWidget().getCharCount(), 0, newColor, null); - } else { - currentStyleRange = null; - } - } - - private void setCursorPosition(String command) { - String str = command.substring(2, command.length() - 1); - int i = str.indexOf(';'); - int line = 0, column = 0; - if (i != -1) { - line = Integer.valueOf(str.substring(0, i)); - column = Integer.valueOf(str.substring(i + 1)); - } else if (str.length() > 0) { - line = Integer.valueOf(str); - } - StyledText textWidget = getTextWidget(); - int offset = textWidget.getOffsetAtLine(line); - int maxColumn = textWidget.getLine(line).length(); - offset += Math.min(maxColumn, column); - getTextWidget().setCaretOffset(caretOffset = offset); - } - - private void clearCurrentScreenPage(String command) { - String str = command.substring(2, command.length() - 1); - if ("2".equals(str)) { - getDocument().set(""); - } - } - } Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/NewProjectPostProcessor.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/NewProjectPostProcessor.java 2012-01-20 21:26:21 UTC (rev 38006) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/NewProjectPostProcessor.java 2012-01-20 22:18:46 UTC (rev 38007) @@ -7,6 +7,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.SWT; +import org.jboss.tools.forge.core.preferences.ForgeRuntimesPreferences; import org.jboss.tools.forge.core.process.ForgeRuntime; import org.jboss.tools.forge.importer.ProjectImporter; import org.jboss.tools.forge.ui.part.ForgeView; @@ -68,7 +69,7 @@ private void resetRuntime() { ForgeView forgeView = ForgeHelper.getForgeView(); if (forgeView != null) { - ForgeRuntime runtime = forgeView.getRuntime(); + ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault(); if (runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) { runtime.sendInput("reset\n"); } Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/document/ForgeDocument.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/document/ForgeDocument.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/document/ForgeDocument.java 2012-01-20 22:18:46 UTC (rev 38007) @@ -0,0 +1,240 @@ +package org.jboss.tools.forge.ui.document; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.Document; +import org.eclipse.swt.custom.StyleRange; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.widgets.Display; +import org.jboss.tools.forge.core.io.ForgeAnsiCommandFilter; +import org.jboss.tools.forge.core.io.ForgeOutputListener; +import org.jboss.tools.forge.core.process.ForgeRuntime; +import org.jboss.tools.forge.ui.ForgeUIPlugin; +import org.jboss.tools.forge.ui.console.ForgeCommandFilter; + +public class ForgeDocument extends Document { + + public static final ForgeDocument INSTANCE = new ForgeDocument(); + + public interface CursorListener { + void cursorMoved(); + } + + private class AsyncForgeCommandFilter extends ForgeCommandFilter { + public AsyncForgeCommandFilter(ForgeOutputListener listener) { + super(listener); + } + public void outputAvailable(final String output) { + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + AsyncForgeCommandFilter.super.outputAvailable(output); + } + }); + } + } + + private PropertyChangeListener pcl = new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (ForgeRuntime.PROPERTY_STATE.equals(evt.getPropertyName())) { + if (ForgeRuntime.STATE_NOT_RUNNING.equals(evt.getNewValue())) { + Display.getDefault().asyncExec(new Runnable() { + @Override + public void run() { + disconnect(); + } + }); + } + } + } + }; + + private ForgeRuntime runtime; + private int cursorOffset = 0; + private StyleRange currentStyleRange; + private ForgeOutputListener outputListener; + private Map<String, Color> colors; + private List<StyleRange> styleRanges = new ArrayList<StyleRange>(); + private Set<CursorListener> cursorListeners = new HashSet<CursorListener>(); + + private ForgeDocument() { + initColors(); + } + + public void finalize() throws Throwable { + disposeColors(); + super.finalize(); + } + + public void connect(ForgeRuntime runtime) { + this.runtime = runtime; + runtime.addPropertyChangeListener(pcl); + ForgeOutputListener target = new ForgeOutputListener() { + @Override + public void outputAvailable(String output) { + handleAvailableOutput(output); + } + }; + ForgeAnsiCommandFilter facf = new ForgeAnsiCommandFilter(target) { + @Override + public void ansiCommandAvailable(String command) { + executeAnsiCommand(command); + } + }; + outputListener = new AsyncForgeCommandFilter(facf); + runtime.addOutputListener(outputListener); + } + + private void disconnect() { + runtime.removeOutputListener(outputListener); + runtime.removePropertyChangeListener(pcl); + runtime = null; + reset(); + } + + private void executeAnsiCommand(final String command) { + char c = command.charAt(command.length() - 1); + switch (c) { + case 'G' : moveCursorAbsoluteInLine(command); break; + case 'K' : clearCurrentLine(command); break; + case 'm' : changeColor(command); break; + case 'H' : setCursorPosition(command); break; + case 'J' : clearCurrentScreenPage(command); break; + default : ForgeUIPlugin.log(new RuntimeException("Unhandled Ansi control sequence in ForgeTextViewer: "+ command)); + } + + } + + private void handleAvailableOutput(String output) { + try { + String filteredOutput = output.replaceAll("\r", ""); + if (currentStyleRange != null) { + currentStyleRange.length = currentStyleRange.length + filteredOutput.length(); + } + replace(cursorOffset, getLength() - cursorOffset, filteredOutput); + moveCursorTo(cursorOffset + filteredOutput.length()); + } catch (BadLocationException e) { + ForgeUIPlugin.log(e); + } + } + + private void moveCursorAbsoluteInLine(final String command) { + try { + int column = Integer.valueOf(command.substring(2, command.length() - 1)); + int lineStart = getLineOffset(getLineOfOffset(cursorOffset)); + moveCursorTo(lineStart + column - 1); + } catch (BadLocationException e) { + ForgeUIPlugin.log(e); + } + } + + private void clearCurrentLine(String command) { + try { + replace(cursorOffset, getLength() - cursorOffset, ""); + } catch (BadLocationException e) { + ForgeUIPlugin.log(e); + } + } + + private void changeColor(String command) { + String str = command.substring(2, command.length() - 1); + Color newColor = colors.get(str); + if (newColor != null) { + currentStyleRange = new StyleRange(getLength(), 0, newColor, null); + styleRanges.add(currentStyleRange); + } else { + currentStyleRange = null; + } + } + + private void setCursorPosition(String command) { + String str = command.substring(2, command.length() - 1); + int i = str.indexOf(';'); + int line = 0, column = 0; + if (i != -1) { + line = Integer.valueOf(str.substring(0, i)); + column = Integer.valueOf(str.substring(i + 1)); + } else if (str.length() > 0) { + line = Integer.valueOf(str); + } + try { + int offset = getLineOffset(line); + int maxColumn = getLineLength(line); + offset += Math.min(maxColumn, column); + moveCursorTo(offset); + } catch (BadLocationException e) { + ForgeUIPlugin.log(e); + } + } + + private void clearCurrentScreenPage(String command) { + System.out.println("clearCurrentScreenPage(" + command + ")"); + String str = command.substring(2, command.length() - 1); + if ("2".equals(str)) { + reset(); + } + } + + private void reset() { + set(""); + moveCursorTo(0); + styleRanges.clear(); + currentStyleRange = null; + } + + private void initColors() { + colors = new HashMap<String, Color>(); + colors.put("30", new Color (Display.getDefault(), 0,0,0)); + colors.put("31", new Color (Display.getDefault(), 0xFF,0,0)); + colors.put("32", new Color (Display.getDefault(), 0,0xFF,0)); + colors.put("33", new Color (Display.getDefault(), 0x80,0x80,0)); + colors.put("34", new Color (Display.getDefault(), 0,0,0xFF)); + colors.put("35", new Color (Display.getDefault(), 0xFF,0,0xFF)); + colors.put("36", new Color (Display.getDefault(), 0,0xFF,0xFF)); + colors.put("37", new Color (Display.getDefault(), 0xC0,0xC0,0xC0)); + } + + private void disposeColors() { + for (Color color : colors.values()) { + color.dispose(); + } + colors = null; + } + + public StyleRange getCurrentStyleRange() { + return currentStyleRange; + } + + public StyleRange[] getStyleRanges() { + return styleRanges.toArray(new StyleRange[styleRanges.size()]); + } + + public int getCursorOffset() { + return cursorOffset; + } + + public void addCursorListener(CursorListener listener) { + cursorListeners.add(listener); + } + + public void removeCursorListener(CursorListener listener) { + cursorListeners.remove(listener); + } + + private void moveCursorTo(int newOffset) { + cursorOffset = newOffset; + for (CursorListener listener : cursorListeners) { + listener.cursorMoved(); + } + } + +} Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/document/ForgeDocument.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/document/ForgeDocumentPartitioner.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/document/ForgeDocumentPartitioner.java (rev 0) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/document/ForgeDocumentPartitioner.java 2012-01-20 22:18:46 UTC (rev 38007) @@ -0,0 +1,58 @@ +package org.jboss.tools.forge.ui.document; + +import org.eclipse.jface.text.DocumentEvent; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IDocumentPartitioner; +import org.eclipse.jface.text.ITypedRegion; + +public class ForgeDocumentPartitioner implements IDocumentPartitioner { + + @Override + public void connect(IDocument document) { + // TODO Auto-generated method stub + + } + + @Override + public void disconnect() { + // TODO Auto-generated method stub + + } + + @Override + public void documentAboutToBeChanged(DocumentEvent event) { + // TODO Auto-generated method stub + + } + + @Override + public boolean documentChanged(DocumentEvent event) { + // TODO Auto-generated method stub + return false; + } + + @Override + public String[] getLegalContentTypes() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getContentType(int offset) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ITypedRegion[] computePartitioning(int offset, int length) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ITypedRegion getPartition(int offset) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/document/ForgeDocumentPartitioner.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java 2012-01-20 21:26:21 UTC (rev 38006) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ForgeView.java 2012-01-20 22:18:46 UTC (rev 38007) @@ -33,6 +33,7 @@ import org.jboss.tools.forge.ui.ForgeUIPlugin; import org.jboss.tools.forge.ui.commands.SourceProvider; import org.jboss.tools.forge.ui.console.ForgeTextViewer; +import org.jboss.tools.forge.ui.document.ForgeDocument; public class ForgeView extends ViewPart implements PropertyChangeListener, IShowInTarget { @@ -41,30 +42,20 @@ private static final String NOT_RUNNING_MESSAGE = "Forge is not running."; private static final String STARTING_MESSAGE = "Please wait while Forge is starting"; - private class ForgePage extends Page { - + private class ForgePage extends Page { private ForgeTextViewer viewer; - private ForgeRuntime runtime; - - public ForgePage(ForgeRuntime runtime) { - this.runtime = runtime; - } - @Override public void createControl(Composite parent) { - viewer = new ForgeTextViewer(parent, runtime); + viewer = new ForgeTextViewer(parent); } - @Override public Control getControl() { return viewer == null ? null : viewer.getControl(); } - @Override public void setFocus() { viewer.getControl().setFocus(); - } - + } } private PageBook pageBook = null; @@ -74,7 +65,6 @@ private MessagePage notRunningPage; private String notRunningMessage; - private ForgeRuntime runtime; private ISelection selection; private SelectionSynchronizer synchronizer; @@ -82,7 +72,8 @@ public void createPartControl(Composite parent) { synchronizer = new SelectionSynchronizer(this); pageBook = new PageBook(parent, SWT.NONE); - createNotRunningPage(parent); + createRunningPage(); + createNotRunningPage(); showPage(notRunning); getSite().getWorkbenchWindow().getSelectionService().addSelectionListener(new ISelectionListener() { @Override @@ -100,7 +91,7 @@ synchronizer.setEnabled(synced); } - private void createNotRunningPage(Composite parent) { + private void createNotRunningPage() { MessagePage page = new MessagePage(); page.createControl(pageBook); page.init(new PageSite(getViewSite())); @@ -110,11 +101,16 @@ notRunningPage = page; } + private void createRunningPage() { + runningPage = new ForgePage(); + runningPage.createControl(pageBook); + runningPage.init(new PageSite(getViewSite())); + running = runningPage.getControl(); + } + @Override public void setFocus() { - if (runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) { - runningPage.setFocus(); - } + runningPage.setFocus(); } @Override @@ -136,7 +132,6 @@ public void run() { notRunningMessage = STARTING_MESSAGE; notRunningPage.setMessage(notRunningMessage); - createRunningPage(); } }); } @@ -152,9 +147,9 @@ } private void handleStateNotRunning() { + ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault(); if (runtime != null) { runtime.removePropertyChangeListener(this); - runtime = null; } getDisplay().asyncExec(new Runnable() { @Override @@ -188,31 +183,25 @@ } } - private void createRunningPage() { - Control oldForgeIsRunning = running; - Page oldForgeIsRunningPage = runningPage; - runningPage = new ForgePage(runtime); - runningPage.createControl(pageBook); - runningPage.init(new PageSite(getViewSite())); - running = runningPage.getControl(); - if (oldForgeIsRunningPage != null) { - oldForgeIsRunningPage.dispose(); - } - if (oldForgeIsRunning != null) { - oldForgeIsRunning.dispose(); - } - } +// private void createRunningPage() { +// Control oldForgeIsRunning = running; +// Page oldForgeIsRunningPage = runningPage; +// runningPage = new ForgePage(runtime); +// runningPage.createControl(pageBook); +// runningPage.init(new PageSite(getViewSite())); +// running = runningPage.getControl(); +// if (oldForgeIsRunningPage != null) { +// oldForgeIsRunningPage.dispose(); +// } +// if (oldForgeIsRunning != null) { +// oldForgeIsRunning.dispose(); +// } +// } - public void dispose() { - if (runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) { - stopForge(); - } - super.dispose(); - } - public void startForge() { - if (runtime != null) return; - runtime = ForgeRuntimesPreferences.INSTANCE.getDefault(); + final ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault(); + if (ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) return; + ForgeDocument.INSTANCE.connect(runtime); runtime.addPropertyChangeListener(this); Job job = new Job("Starting Forge") { @Override @@ -249,24 +238,20 @@ } public void stopForge() { - if (runtime == null) return; - final IProgressMonitor progressMonitor = getViewSite().getActionBars().getStatusLineManager().getProgressMonitor(); + IProgressMonitor progressMonitor = getViewSite().getActionBars().getStatusLineManager().getProgressMonitor(); + ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault(); runtime.stop(progressMonitor); - runtime = null; } private Display getDisplay() { return getSite().getShell().getDisplay(); } - public ForgeRuntime getRuntime() { - return runtime; - } - public boolean show(ShowInContext context) { if (context == null) { return false; } + ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault(); if (runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) { return goToSelection(context.getSelection()); } else { @@ -286,6 +271,7 @@ Thread waitThread = new Thread(new Runnable() { @Override public void run() { + ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault(); while (runtime != null && !ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) { try { Thread.sleep(1000); @@ -329,6 +315,7 @@ if (str.indexOf(' ') != -1) { str = '\"' + str + '\"'; } + ForgeRuntime runtime = ForgeRuntimesPreferences.INSTANCE.getDefault(); runtime.sendInput("pick-up " + str + "\n"); } Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/SelectionSynchronizer.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/SelectionSynchronizer.java 2012-01-20 21:26:21 UTC (rev 38006) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/SelectionSynchronizer.java 2012-01-20 22:18:46 UTC (rev 38007) @@ -10,6 +10,7 @@ import org.eclipse.ui.ISelectionListener; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; +import org.jboss.tools.forge.core.preferences.ForgeRuntimesPreferences; import org.jboss.tools.forge.core.process.ForgeRuntime; @@ -42,7 +43,7 @@ if (path.indexOf(' ') != -1) { path = '\"' + path + '\"'; } - ForgeRuntime forgeRuntime = forgeView.getRuntime(); + ForgeRuntime forgeRuntime = ForgeRuntimesPreferences.INSTANCE.getDefault(); if (forgeRuntime != null && ForgeRuntime.STATE_RUNNING.equals(forgeRuntime.getState())) { forgeRuntime.sendInput("pick-up " + path + "\n"); } @@ -83,7 +84,7 @@ if (path.indexOf(' ') != -1) { path = '\"' + path + '\"'; } - ForgeRuntime forgeRuntime = forgeView.getRuntime(); + ForgeRuntime forgeRuntime = ForgeRuntimesPreferences.INSTANCE.getDefault(); if (forgeRuntime != null && ForgeRuntime.STATE_RUNNING.equals(forgeRuntime.getState())) { forgeRuntime.sendInput("pick-up " + path + "\n"); }

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38006 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2012-01-20 16:26:21 -0500 (Fri, 20 Jan 2012) New Revision: 38006 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java Log: https://issues.jboss.org/browse/JBIDE-10679 Seam facet version 2.3 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java 2012-01-20 19:11:56 UTC (rev 38005) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamRuntimeManager.java 2012-01-20 21:26:21 UTC (rev 38006) @@ -116,7 +116,7 @@ * then the default one will be returned. */ public SeamRuntime getLatestSeamRuntime() { - SeamVersion latestVersion = SeamVersion.getLatestDefaultVersion(); + SeamVersion latestVersion = runtimes.isEmpty()?SeamVersion.getLatestDefaultVersion():SeamVersion.SEAM_2_0; for (SeamRuntime runtime : runtimes.values()) { if(runtime.getVersion().compareTo(latestVersion)>=0) { latestVersion = runtime.getVersion();

12 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r38005 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2012-01-20 14:11:56 -0500 (Fri, 20 Jan 2012) New Revision: 38005 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.0.1-SNAPSHOT.jar Log: [https://issues.jboss.org/browse/JBIDE-10683] built and embedded the latest client jar Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-1.0.1-SNAPSHOT.jar =================================================================== (Binary files differ)

12 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits January 2012